Marc Alexander
f4761b5e08
[ticket/12858] Directly return and use timezone selects
...
PHPBB3-12858
2014-09-17 19:07:24 +02:00
Jakub Senko
3885ac90f1
[ticket/13044] Move GMT out of gmdate in functions_acp
...
PHPBB3-13044
2014-09-17 18:38:21 +02:00
Jakub Senko
3d637fea98
[ticket/13044] Move GMT out of gmdate()
...
PHPBB3-13044
2014-09-17 18:35:38 +02:00
Marc Alexander
9c310f789f
[ticket/12858] Rename tz_ prefixed block variables to timezone_ prefix
...
PHPBB3-12858
2014-09-17 17:56:09 +02:00
Marc Alexander
6323180344
[ticket/12858] Fix timezone display on acp users page
...
PHPBB3-12858
2014-09-17 17:56:09 +02:00
Marc Alexander
9a3aeb8a99
[ticket/12858] Remove hardcoded language entries from timezone selects
...
PHPBB3-12858
2014-09-17 17:56:04 +02:00
Marc Alexander
3dbac0f88b
[ticket/12858] Use UTC for time info in footer and hide offset if it's 0
...
PHPBB3-12858
2014-09-17 14:23:34 +02:00
Marc Alexander
9ebee7de32
[ticket/12858] Generate timezone selects with template loop
...
PHPBB3-12858
2014-09-17 14:22:08 +02:00
Jakub Senko
ea5e46f6dd
[ticket/13044] \G\M\T to GMT in whole project
...
Note that there are more uses of "\G\M\T" in vendor files.
PHPBB3-13044
2014-09-17 11:56:37 +02:00
Jakub Senko
7cbd9e9524
[ticket/13044] move GMT string out of gmdate()
...
PHPBB3-13044
2014-09-17 11:15:24 +02:00
Jakub Senko
33b2063680
[ticket/13044] Correct Expires headers
...
PHPBB3-13044
2014-09-17 10:52:19 +02:00
Marc Alexander
cf71bfbdf2
Merge branch 'develop-ascraeus' into develop
2014-09-16 19:24:45 +02:00
Marc Alexander
b3576d77da
Merge pull request #2921 from Nicofuma/ticket/13034
...
[ticket/13034] Fix the route generated for the frontend not in the phpbb root path
2014-09-16 19:24:07 +02:00
PayBas
0061a305d8
[ticket/12408] Fix white-space sniffer
...
PHPBB3-12408
2014-09-15 15:25:43 +02:00
PayBas
aaddf41e5b
[ticket/12408] Changed lang vars, added fieldset and removed "default"
...
PHPBB3-12408
2014-09-15 14:43:40 +02:00
PayBas
0b4944f125
[ticket/12408] Public functions and updated doc block
...
PHPBB3-12408
2014-09-15 14:43:40 +02:00
PayBas
60c9955f51
[ticket/12408] Code cleanup
...
Rebased to see if travis will finally play along
PHPBB3-12408
2014-09-15 14:43:39 +02:00
PayBas
ae63843647
[ticket/12408] Simplified queries
...
PHPBB3-12408
2014-09-15 14:43:38 +02:00
PayBas
265c621c9e
[ticket/12408] Add quick setting for "default guest style" to ACP
...
PHPBB3-12408
2014-09-15 14:43:38 +02:00
Tristan Darricau
1507c5af64
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13019] Do not hide reason field when deleting permanently.
[ticket/13019] Rename deletion reason label.
[ticket/13019] Always accept a reason for deleting a post/topic.
2014-09-14 22:07:52 +02:00
Cesar G
bf7041eeb9
[ticket/13019] Always accept a reason for deleting a post/topic.
...
PHPBB3-13019
2014-09-14 10:38:56 -07:00
Tristan Darricau
c988b98ac6
[ticket/13061] Replace the service event.subscriber_loader by a compiler pass
...
PHPBB3-13061
2014-09-13 14:34:18 +02:00
Andreas Fischer
f73e60935d
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php
2014-09-12 00:52:24 +02:00
Tristan Darricau
7b4c5bdd34
[ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php
...
PHPBB3-13057
2014-09-11 22:01:09 +02:00
Tristan Darricau
dd2a643e65
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13005] Add event to display_forums() to modify category template data
2014-09-11 16:59:38 +02:00
Tristan Darricau
7d6ceb81c1
Merge pull request #2901 from rxu/ticket/13005
...
[ticket/13005] Add event to display_forums() to modify category template data
* rxu/ticket/13005:
[ticket/13005] Add event to display_forums() to modify category template data
2014-09-11 16:58:34 +02:00
Tristan Darricau
d1c4e0d63c
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
2014-09-11 16:44:57 +02:00
Tristan Darricau
5804e43589
Merge pull request #2903 from rxu/ticket/13006
...
[ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
* rxu/ticket/13006:
[ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
2014-09-11 16:44:16 +02:00
Andreas Fischer
2c7fbb9e61
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13042] Remove unused variables
2014-09-10 22:17:18 +02:00
Andreas Fischer
d42401056c
Merge pull request #2940 from Senky/ticket/13042
...
[ticket/13042] Unused var in login_box()
* Senky/ticket/13042:
[ticket/13042] Remove unused variables
2014-09-10 22:17:17 +02:00
Tristan Darricau
d465e7e438
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12976] Correctly use plurals for attachment count in UCP navigation
Conflicts:
phpBB/styles/subsilver2/template/ucp_attachments.html
2014-09-10 20:02:20 +02:00
Tristan Darricau
c842583bbf
Merge pull request #2936 from nickvergessen/ticket/12976
...
[ticket/12976] Correctly use plurals for attachment count in UCP navigation
* nickvergessen/ticket/12976:
[ticket/12976] Correctly use plurals for attachment count in UCP navigation
2014-09-10 20:00:52 +02:00
Jakub Senko
51f5c2d094
[ticket/13042] Remove unused variables
...
PHPBB3-13042
2014-09-10 17:38:05 +02:00
Tristan Darricau
d320897180
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13052] Restore timespan parameter for check_form_key()
2014-09-10 11:50:28 +02:00
Joas Schilling
d87547da66
[ticket/13052] Restore timespan parameter for check_form_key()
...
PHPBB3-13052
2014-09-10 08:07:21 +02:00
Jakub Senko
bfb672f326
[ticket/13027] round to floor
...
PHPBB3-13027
2014-09-09 21:33:19 +02:00
Joas Schilling
d9f36ae7e1
[ticket/12976] Correctly use plurals for attachment count in UCP navigation
...
PHPBB3-12976
2014-09-09 21:31:34 +02:00
Andreas Fischer
aa6d7a09b8
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13052] Use request class instead of $_POST and request_var()
[ticket/13052] Fix appearances with multiple parameters
[ticket/13052] Remove additional parameter from check_form_key()
2014-09-09 21:25:21 +02:00
Joas Schilling
ef61deb132
[ticket/13052] Use request class instead of $_POST and request_var()
...
PHPBB3-13052
2014-09-09 19:49:17 +02:00
Joas Schilling
ad8d53af27
[ticket/13052] Fix appearances with multiple parameters
...
PHPBB3-13052
2014-09-09 19:47:00 +02:00
Joas Schilling
047728e3d4
[ticket/13052] Remove additional parameter from check_form_key()
...
PHPBB3-13052
2014-09-09 19:46:27 +02:00
Marc Alexander
c00e0c55c5
Merge branch 'develop-ascraeus' into develop
2014-09-07 11:58:57 +02:00
Marc Alexander
a0ee6ccdf3
Merge pull request #2925 from nickvergessen/ticket/12983
...
Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
2014-09-07 11:41:44 +02:00
Tristan Darricau
e0711b417f
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
[ticket/13031] Guess with all mimetype guessers and pick best guess
[ticket/13031] Only use mimetype guesser guess if it helps us
2014-09-06 13:54:16 +02:00
Tristan Darricau
6387bf8d13
Merge pull request #2918 from marc1706/ticket/13031
...
[ticket/13031] Only use mimetype guesser guess if it helps us
* marc1706/ticket/13031:
[ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
[ticket/13031] Guess with all mimetype guessers and pick best guess
[ticket/13031] Only use mimetype guesser guess if it helps us
2014-09-06 13:53:43 +02:00
Marc Alexander
bc38730ab5
Merge branch 'develop-ascraeus' into develop
2014-09-05 21:36:02 +02:00
Marc Alexander
6eaeae60f6
Merge pull request #2748 from carlo94it/ticket/12765
...
[ticket/12765] Use db_tools instead of generating queries at moment
2014-09-05 21:23:04 +02:00
Joas Schilling
b9cb3b9e3e
[ticket/12983] Correctly validate sorting options in the UCP
...
PHPBB3-12983
2014-09-05 13:24:31 +02:00
Marc Alexander
d31ff51785
[ticket/13031] Guess with all mimetype guessers and pick best guess
...
PHPBB3-13031
2014-09-05 10:56:06 +02:00
Tristan Darricau
cb3eb84665
[ticket/13034] Fix the route generated for the frontend not in the phpbb root
...
PHPBB3-13034
2014-09-04 23:21:55 +02:00