| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-01 | 4 | -28/+79 |
| |\ | |||||
| | * | Merge pull request #2888 from Nicofuma/ticket/12993 | Joas Schilling | 2014-10-01 | 4 | -28/+79 |
| | |\ | | | | | | | | | | [ticket/12993] Improve get_user_ranks | ||||
| | | * | [ticket/12993] Update doc block | Tristan Darricau | 2014-09-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-12993 | ||||
| | | * | [ticket/12993] Return an array instead of reference passing | Tristan Darricau | 2014-08-19 | 4 | -23/+35 |
| | | | | | | | | | | | | | PHPBB3-12993 | ||||
| | | * | [ticket/12993] Fix includes of functions_display | Tristan Darricau | 2014-08-19 | 3 | -3/+9 |
| | | | | | | | | | | | | | PHPBB3-12993 | ||||
| | | * | [ticket/12993] Rename to phpbb_get_user_rank | Tristan Darricau | 2014-08-18 | 4 | -7/+24 |
| | | | | | | | | | | | | | PHPBB3-12993 | ||||
| | | * | [ticket/12993] Improve get_user_ranks | Forumhulp.com | 2014-08-18 | 3 | -11/+27 |
| | | | | | | | | | | | | | | | | | | | Explanation in http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=46051 PHPBB3-12993 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-01 | 1 | -1/+13 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'ticket/12985' into develop-ascraeus | Joas Schilling | 2014-10-01 | 1 | -1/+13 |
| | |\ \ | |||||
| | | * | | [ticket/12985] Add core.login_box_redirect | david63 | 2014-10-01 | 1 | -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 develop | Cesar G | 2014-10-01 | 2 | -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-ascraeus | Cesar G | 2014-10-01 | 2 | -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 class | Joas Schilling | 2014-09-30 | 2 | -32/+24 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13119 | ||||
| | | * | | | [ticket/13119] Add events to ACP's ban module | Joas Schilling | 2014-09-30 | 1 | -4/+60 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13119 | ||||
| | | * | | | [ticket/13119] Add events to MCP's ban module | Joas Schilling | 2014-09-30 | 1 | -8/+77 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13119 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Andreas Fischer | 2014-10-01 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders | ||||
| | * | | | | [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders | Tristan Darricau | 2014-09-30 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | PHPBB3-13120 | ||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-09-24 | 6 | -34/+46 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/timezone_option.html | ||||
| | * | | | Merge pull request #2844 from marc1706/ticket/12858 | Joas Schilling | 2014-09-24 | 6 | -34/+46 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC | ||||
| | | * | | | [ticket/12858] Properly format UTC offset in footer | Marc Alexander | 2014-09-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858 | ||||
| | | * | | | [ticket/12858] Directly return and use timezone selects | Marc Alexander | 2014-09-17 | 5 | -9/+5 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858 | ||||
| | | * | | | [ticket/12858] Rename tz_ prefixed block variables to timezone_ prefix | Marc Alexander | 2014-09-17 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858 | ||||
| | | * | | | [ticket/12858] Fix timezone display on acp users page | Marc Alexander | 2014-09-17 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858 | ||||
| | | * | | | [ticket/12858] Remove hardcoded language entries from timezone selects | Marc Alexander | 2014-09-17 | 1 | -14/+16 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858 | ||||
| | | * | | | [ticket/12858] Use UTC for time info in footer and hide offset if it's 0 | Marc Alexander | 2014-09-17 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858 | ||||
| | | * | | | [ticket/12858] Generate timezone selects with template loop | Marc Alexander | 2014-09-17 | 6 | -16/+27 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-09-23 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge pull request #2937 from Senky/ticket/13027 | Joas Schilling | 2014-09-23 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13027] PM folder full percentage could be a bit more accurate | ||||
| | | * | | | | [ticket/13027] round to floor | Jakub Senko | 2014-09-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13027 | ||||
| * | | | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-09-23 | 1 | -9/+32 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge pull request #2984 from nickvergessen/ticket/10729-asc | Marc Alexander | 2014-09-23 | 1 | -9/+32 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [3.1][ticket/10729] Update editor information when user being deleted | ||||
| | | * \ \ \ \ | Merge branch 'ticket/10729' into ticket/10729-asc | Joas Schilling | 2014-09-23 | 1 | -4/+8 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions_user.php | ||||
| | | | * | | | | | [ticket/10729] Fix doc block for user_delete | Joas Schilling | 2014-09-22 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729 | ||||
| | | * | | | | | | [ticket/10729] Update *_delete_user when user being deleted | Oliver Schramm | 2014-07-18 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729 | ||||
| | | * | | | | | | Merge branch 'ticket/10729' into ticket/10729-2 | Oliver Schramm | 2014-07-18 | 1 | -5/+12 |
| | | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions_user.php | ||||
| | | | * | | | | | [ticket/10729] Update message_edit_user when user being deleted | Oliver Schramm | 2014-07-18 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729 | ||||
| | | | * | | | | | [ticket/10729] Update post_edit_user when user being deleted | Oliver Schramm | 2014-07-17 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10729 | ||||
| * | | | | | | | | Merge branch 'develop-ascraeus' into develop | Dhruv | 2014-09-21 | 7 | -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/13045 | Dhruv Goel | 2014-09-21 | 7 | -11/+9 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13045] Remove Pragma headers | ||||
| | | * | | | | | | | [ticket/13045] Remove Pragma headers | Jakub Senko | 2014-09-17 | 7 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13045 | ||||
| | * | | | | | | | | [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development | Joas Schilling | 2014-09-20 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4 | Joas Schilling | 2014-09-19 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'ticket/13073' into ticket/13073-develop | Marc Alexander | 2014-09-19 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/controller/common_helper_route.php | ||||
| | * | | | | | | | | [ticket/13073] Add path regex to get_preg_expression() and add unit tests | Marc Alexander | 2014-09-19 | 1 | -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 develop | Joas Schilling | 2014-09-17 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13061] Replace the service event.subscriber_loader by a compiler pass | ||||
| | * | | | | | | | Merge pull request #2948 from Nicofuma/ticket/13061 | Joas Schilling | 2014-09-17 | 1 | -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 pass | Tristan Darricau | 2014-09-13 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13061 | ||||
| * | | | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-09-17 | 3 | -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_acp | Jakub Senko | 2014-09-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13044 | ||||
| | * | | | | | | | [ticket/13044] Move GMT out of gmdate() | Jakub Senko | 2014-09-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13044 | ||||
