aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-014-28/+79
|\
| * Merge pull request #2888 from Nicofuma/ticket/12993Joas Schilling2014-10-014-28/+79
| |\ | | | | | | | | | [ticket/12993] Improve get_user_ranks
| | * [ticket/12993] Update doc blockTristan Darricau2014-09-241-1/+1
| | | | | | | | | | | | PHPBB3-12993
| | * [ticket/12993] Return an array instead of reference passingTristan Darricau2014-08-194-23/+35
| | | | | | | | | | | | PHPBB3-12993
| | * [ticket/12993] Fix includes of functions_displayTristan Darricau2014-08-193-3/+9
| | | | | | | | | | | | PHPBB3-12993
| | * [ticket/12993] Rename to phpbb_get_user_rankTristan Darricau2014-08-184-7/+24
| | | | | | | | | | | | PHPBB3-12993
| | * [ticket/12993] Improve get_user_ranksForumhulp.com2014-08-183-11/+27
| | | | | | | | | | | | | | | | | | Explanation in http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=46051 PHPBB3-12993
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-011-1/+13
|\ \ \ | |/ /
| * | Merge branch 'ticket/12985' into develop-ascraeusJoas Schilling2014-10-011-1/+13
| |\ \
| | * | [ticket/12985] Add core.login_box_redirectdavid632014-10-011-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.login_box_redirect core event to allow extensions to redirect a user to a specific page when logging in. PHPBB3-12985
* | | | Merge branch 'develop-ascraeus' into developCesar G2014-10-012-38/+155
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * 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
| * | | Merge remote-tracking branch 'nickvergessen/ticket/13119' into develop-ascraeusCesar G2014-10-012-38/+155
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | [ticket/13119] Remove unused globals and use the request classJoas Schilling2014-09-302-32/+24
| | | | | | | | | | | | | | | | | | | | PHPBB3-13119
| | * | | [ticket/13119] Add events to ACP's ban moduleJoas Schilling2014-09-301-4/+60
| | | | | | | | | | | | | | | | | | | | PHPBB3-13119
| | * | | [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