makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-22 11:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
23914 commits 18 branches 192 tags 207 MiB
Commit graph

20439 commits

Author SHA1 Message Date
Joas Schilling
b1d35363db Merge branch 'develop-ascraeus' into develop 2014-10-01 10:24:27 +02:00
Joas Schilling
75fcfb1c1d Merge pull request #2545 from ptitlazy/ticket/12657 
[ticket/12657] Add a test file for base case of command cache:purge
 2014-10-01 10:24:19 +02:00
Joas Schilling
d73194a415 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:19:39 +02:00
Joas Schilling
170b75d0c9 Merge pull request #2888 from Nicofuma/ticket/12993 
[ticket/12993] Improve get_user_ranks
 2014-10-01 10:19:24 +02:00
Joas Schilling
9ad7eddc25 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:09:39 +02:00
Joas Schilling
994a0dcd4c Merge branch 'ticket/12985' into develop-ascraeus 2014-10-01 10:09:29 +02:00
david63
5314c2bddf [ticket/12985] Add core.login_box_redirect 
Add core.login_box_redirect core event to allow extensions to redirect a
user to a specific page when logging in.

PHPBB3-12985
 2014-10-01 10:09:10 +02:00
Joas Schilling
b99ba4d416 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:03:16 +02:00
Joas Schilling
b6acc1b9db Merge pull request #2978 from blitze/ticket/13071 
[ticket/13071] Only use total_match_count after event dispatcher
 2014-10-01 10:01:09 +02:00
Joas Schilling
48dd87bd34 Merge branch 'develop-ascraeus' into develop 2014-10-01 09:56:51 +02:00
Joas Schilling
1b393b1d0b Merge pull request #2979 from blitze/ticket/13072 
[ticket/13072] Add total_match_count to core.search_get_topic_data event
 2014-10-01 09:56:39 +02:00
Joas Schilling
d3ee8d24bc Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/forumlist_body.html
 2014-10-01 09:53:08 +02:00
Joas Schilling
effb5d95d0 Merge pull request #2998 from rxu/ticket/13107 
[ticket/13107] Add template events to forum row in forumlist_body.html
 2014-10-01 09:50:38 +02:00
Cesar G
d644de5217 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13119] Remove unused globals and use the request class
  [ticket/13119] Add events to ACP's ban module
  [ticket/13119] Add events to MCP's ban module
 2014-10-01 00:44:16 -07:00
Cesar G
8ab7f6b595 Merge remote-tracking branch 'nickvergessen/ticket/13119' into develop-ascraeus 
* nickvergessen/ticket/13119:
  [ticket/13119] Remove unused globals and use the request class
  [ticket/13119] Add events to ACP's ban module
  [ticket/13119] Add events to MCP's ban module
 2014-10-01 00:43:41 -07:00
Andreas Fischer
236f75c6cb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
 2014-10-01 00:26:39 +02:00
Andreas Fischer
a8e74fff9b Merge pull request #3010 from Nicofuma/ticket/13120 
[ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders

* Nicofuma/ticket/13120:
  [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
 2014-10-01 00:26:39 +02:00
Tristan Darricau
3a413cbf30 [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders 
PHPBB3-13120
 2014-09-30 21:20:42 +02:00
Andreas Fischer
7694623cd2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13111] Dropdown options are already an array in the field data
 2014-09-30 21:04:25 +02:00
Andreas Fischer
8fb9f19aae Merge pull request #3008 from nickvergessen/ticket/13111 
[ticket/13111] Dropdown options are already an array in the field data

* nickvergessen/ticket/13111:
  [ticket/13111] Dropdown options are already an array in the field data
 2014-09-30 21:04:25 +02:00
Andreas Fischer
be5638c110 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13118] Correctly use the provided datetime class
 2014-09-30 21:00:06 +02:00
Andreas Fischer
a0db23bd0e Merge pull request #3007 from nickvergessen/ticket/13118 
[ticket/13118] Correctly use the provided datetime class

* nickvergessen/ticket/13118:
  [ticket/13118] Correctly use the provided datetime class
 2014-09-30 21:00:05 +02:00
Joas Schilling
6f66423de9 [ticket/13119] Remove unused globals and use the request class 
PHPBB3-13119
 2014-09-30 18:22:06 +02:00
Joas Schilling
7efc624b0a [ticket/13119] Add events to ACP's ban module 
PHPBB3-13119
 2014-09-30 18:22:05 +02:00
Joas Schilling
9c3126add0 [ticket/13119] Add events to MCP's ban module 
PHPBB3-13119
 2014-09-30 18:22:04 +02:00
Nils Adermann
e64c1b463e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
 2014-09-30 14:00:25 +02:00
Nils Adermann
f1ab6f31a1 Merge pull request #3003 from nickvergessen/ticket/13117 
[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
 2014-09-30 14:00:02 +02:00
Joas Schilling
f64a937a57 [ticket/13111] Dropdown options are already an array in the field data 
PHPBB3-13111
 2014-09-30 12:27:14 +02:00
Joas Schilling
526329e697 [ticket/13118] Correctly use the provided datetime class 
PHPBB3-13118
 2014-09-30 11:58:02 +02:00
Joas Schilling
bc24c78e06 [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql 
Unintended change from 95ab4b3e93

PHPBB3-13117
 2014-09-29 20:48:47 +02:00
Nils Adermann
8de97b8dbe Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13113] Updates the base url only when the front-end isn't app.php
 2014-09-29 16:17:25 +02:00
Tristan Darricau
a159899d02 [ticket/13113] Updates the base url only when the front-end isn't app.php 
PHPBB3-13113
 2014-09-28 23:32:56 +02:00
rxu
cee8ac9dbe [ticket/13107] Add template events to forum row in forumlist_body.html 
PHPBB3-13107
 2014-09-27 09:26:35 +08:00
Joas Schilling
573c2af336 Merge branch 'develop-ascraeus' into develop 2014-09-25 22:03:01 +02:00
Joas Schilling
71ac6ab2b8 Merge pull request #2996 from Senky/ticket/13104 
[ticket/13104] Responsive tabs display bug in IE11
 2014-09-25 22:02:23 +02:00
Andreas Fischer
b703d1e8df Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
  [ticket/13105] Add a test for relative dates
 2014-09-25 21:52:53 +02:00
Andreas Fischer
be769d4ca6 Merge pull request #2995 from nickvergessen/ticket/13105 
[ticket/13105] Future relative dates are always displayed as "Tomorrow"

* nickvergessen/ticket/13105:
  [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
  [ticket/13105] Add a test for relative dates
 2014-09-25 21:52:53 +02:00
Andreas Fischer
a3e910f23f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php
 2014-09-25 21:47:28 +02:00
Jakub Senko
f64373a29f [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php 
PHPBB3-13106
 2014-09-25 20:12:33 +02:00
Jakub Senko
a1683dfb67 [ticket/13104] inline-block -> block 
PHPBB3-13104
 2014-09-25 20:07:06 +02:00
Joas Schilling
e803efc6fc [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow" 
PHPBB3-13105
 2014-09-25 18:09:32 +02:00
Andreas Fischer
c55a666347 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13086] String replaces 50 with 20
 2014-09-24 21:24:42 +02:00
Andreas Fischer
1b3109d650 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13086] String replaces 50 with 20

Conflicts:
	phpBB/language/en/acp/email.php
 2014-09-24 21:24:29 +02:00
Mario Skouat
077db77259 [ticket/13086] String replaces 50 with 20 
PHPBB3-13086
 2014-09-24 19:03:33 +02:00
Marc Alexander
0b0e00edd7 Merge branch 'develop-ascraeus' into develop 2014-09-24 18:29:12 +02:00
blitze
04e9789e7f [ticket/13072] Added '@changed 3.1.0-RC5 Added total_match_count' 
PHPBB3-13072
 2014-09-24 16:15:38 +00:00
Joas Schilling
b51b4c92e2 [ticket/13087] Correctly link to user profile when contact field has no URL 
Broken by 975c5655f0

PHPBB3-13087
 2014-09-24 17:33:54 +02:00
Tristan Darricau
cd7b21a703 [ticket/12993] Update doc block 
PHPBB3-12993
 2014-09-24 16:07:23 +02:00
Joas Schilling
77ed437b79 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/timezone_option.html
 2014-09-24 14:49:50 +02:00
Joas Schilling
85bc9b69ae Merge pull request #2844 from marc1706/ticket/12858 
[ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
 2014-09-24 13:47:59 +02:00