aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | [ticket/13119] Add events to MCP's ban moduleJoas Schilling2014-09-301-8/+77
| | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13119
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
| * | | | | | | | | | | [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloadersTristan Darricau2014-09-301-1/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13120
* | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-246-34/+46
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/timezone_option.html
| * | | | | | | | | | Merge pull request #2844 from marc1706/ticket/12858Joas Schilling2014-09-246-34/+46
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
| | * | | | | | | | | | [ticket/12858] Properly format UTC offset in footerMarc Alexander2014-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858
| | * | | | | | | | | | [ticket/12858] Directly return and use timezone selectsMarc Alexander2014-09-175-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858
| | * | | | | | | | | | [ticket/12858] Rename tz_ prefixed block variables to timezone_ prefixMarc Alexander2014-09-171-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858
| | * | | | | | | | | | [ticket/12858] Fix timezone display on acp users pageMarc Alexander2014-09-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858
| | * | | | | | | | | | [ticket/12858] Remove hardcoded language entries from timezone selectsMarc Alexander2014-09-171-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858
| | * | | | | | | | | | [ticket/12858] Use UTC for time info in footer and hide offset if it's 0Marc Alexander2014-09-171-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858
| | * | | | | | | | | | [ticket/12858] Generate timezone selects with template loopMarc Alexander2014-09-176-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #2937 from Senky/ticket/13027Joas Schilling2014-09-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13027] PM folder full percentage could be a bit more accurate
| | * | | | | | | | | | | [ticket/13027] round to floorJakub Senko2014-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13027
* | | | | | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-231-9/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #2984 from nickvergessen/ticket/10729-ascMarc Alexander2014-09-231-9/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [3.1][ticket/10729] Update editor information when user being deleted
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ticket/10729' into ticket/10729-ascJoas Schilling2014-09-231-4/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions_user.php
| | | * | | | | | | | | | | [ticket/10729] Fix doc block for user_deleteJoas Schilling2014-09-221-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| | * | | | | | | | | | | | [ticket/10729] Update *_delete_user when user being deletedOliver Schramm2014-07-181-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| | * | | | | | | | | | | | Merge branch 'ticket/10729' into ticket/10729-2Oliver Schramm2014-07-181-5/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions_user.php
| | | * | | | | | | | | | | [ticket/10729] Update message_edit_user when user being deletedOliver Schramm2014-07-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
| | | * | | | | | | | | | | [ticket/10729] Update post_edit_user when user being deletedOliver Schramm2014-07-171-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729
* | | | | | | | | | | | | | Merge branch 'develop-ascraeus' into developDhruv2014-09-217-11/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Jakub Senko # Via Dhruv Goel (1) and Jakub Senko (1) * develop-ascraeus: [ticket/13045] Remove Pragma headers
| * | | | | | | | | | | | | Merge pull request #2963 from Senky/ticket/13045Dhruv Goel2014-09-217-11/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13045] Remove Pragma headers
| | * | | | | | | | | | | | | [ticket/13045] Remove Pragma headersJakub Senko2014-09-177-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13045
| * | | | | | | | | | | | | | [prep-release-3.1.0-RC4] Update phpBB Version for RC4 developmentJoas Schilling2014-09-201-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4Joas Schilling2014-09-191-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ticket/13073' into ticket/13073-developMarc Alexander2014-09-191-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/controller/common_helper_route.php
| * | | | | | | | | | | | | | [ticket/13073] Add path regex to get_preg_expression() and add unit testsMarc Alexander2014-09-191-0/+5
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're now calling get_preg_expression() instead of hardcoding the regex into the helper route method. PHPBB3-13073
* | | | | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-171-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13061] Replace the service event.subscriber_loader by a compiler pass
| * | | | | | | | | | | | | Merge pull request #2948 from Nicofuma/ticket/13061Joas Schilling2014-09-171-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13061] Replace the service event.subscriber_loader by a compiler pass * Nicofuma/ticket/13061: [ticket/13061] Replace the service event.subscriber_loader by a compiler pass
| | * | | | | | | | | | | | [ticket/13061] Replace the service event.subscriber_loader by a compiler passTristan Darricau2014-09-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13061
* | | | | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-173-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13044] Move GMT out of gmdate in functions_acp [ticket/13044] Move GMT out of gmdate() [ticket/13044] \G\M\T to GMT in whole project [ticket/13044] move GMT string out of gmdate() [ticket/13044] Correct Expires headers
| * | | | | | | | | | | | | [ticket/13044] Move GMT out of gmdate in functions_acpJakub Senko2014-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13044
| * | | | | | | | | | | | | [ticket/13044] Move GMT out of gmdate()Jakub Senko2014-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13044
| * | | | | | | | | | | | | [ticket/13044] \G\M\T to GMT in whole projectJakub Senko2014-09-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that there are more uses of "\G\M\T" in vendor files. PHPBB3-13044
| * | | | | | | | | | | | | [ticket/13044] move GMT string out of gmdate()Jakub Senko2014-09-173-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13044
| * | | | | | | | | | | | | [ticket/13044] Correct Expires headersJakub Senko2014-09-173-4/+4
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13044
* | | | | | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-161-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #2921 from Nicofuma/ticket/13034Marc Alexander2014-09-161-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | [ticket/13034] Fix the route generated for the frontend not in the phpbb root path
| | * | | | | | | | | | | [ticket/13034] Fix the route generated for the frontend not in the phpbb rootTristan Darricau2014-09-041-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13034
* | | | | | | | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-141-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | | | | | | | | | | | [ticket/13019] Always accept a reason for deleting a post/topic.Cesar G2014-09-141-4/+4
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13019
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php
| * | | | | | | | | | | [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.phpTristan Darricau2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13057
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-111-3/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13005] Add event to display_forums() to modify category template data
| * | | | | | | | | | | Merge pull request #2901 from rxu/ticket/13005Tristan Darricau2014-09-111-3/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| | * | | | | | | | | | | [ticket/13005] Add event to display_forums() to modify category template datarxu2014-08-221-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While there're events to modify/add FORUM_POST/FORUM_LINK template data, such an event is missing for FORUM_CAT forum type. PHPBB3-13005
* | | | | | | | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-111-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event