Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' into 3.2.x | Máté Bartus | 2016-04-13 | 1 | -41/+52 |
|\ | | | | | | | | | * 3.1.x: [ticket/14598] Support vars docblock in sniffer | ||||
| * | Merge pull request #4287 from Nicofuma/ticket/14598 | Máté Bartus | 2016-04-13 | 1 | -41/+52 |
| |\ | | | | | | | [ticket/14598] Support vars docblock in sniffer | ||||
| | * | [ticket/14598] Support vars docblock in sniffer | Tristan Darricau | 2016-04-12 | 1 | -41/+52 |
| |/ | | | | | | | PHPBB3-14598 | ||||
* | | Merge pull request #4236 from Nicofuma/ticket/13616 | Máté Bartus | 2016-04-13 | 23 | -50/+354 |
|\ \ | | | | | | | [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer | ||||
| * | | [ticket/13616] Fix CS + constant in the core extension | Tristan Darricau | 2016-04-03 | 3 | -4/+8 |
| | | | | | | | | | | | | PHPBB3-13616 | ||||
| * | | [ticket/13616] Fix UI tests | Tristan Darricau | 2016-04-03 | 5 | -4/+17 |
| | | | | | | | | | | | | PHPBB3-13616 | ||||
| * | | [ticket/13616] Cleanup globals after installing the board in func tests | Tristan Darricau | 2016-04-03 | 1 | -2/+10 |
| | | | | | | | | | | | | PHPBB3-13616 | ||||
| * | | [ticket/13616] Updates direct call to twig environment constructor | Tristan Darricau | 2016-04-03 | 9 | -16/+7 |
| | | | | | | | | | | | | PHPBB3-13616 | ||||
| * | | [ticket/13616] Uses a php 5.4 compatible version | Tristan Darricau | 2016-04-03 | 1 | -3/+3 |
| | | | | | | | | | | | | PHPBB3-13616 | ||||
| * | | [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer | Tristan Darricau | 2016-04-03 | 8 | -28/+316 |
| | | | | | | | | | | | | PHPBB3-13616 | ||||
* | | | Merge pull request #4284 from CHItA/ticket/14589 | Tristan Darricau | 2016-04-12 | 2 | -11/+19 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14589] Add error messages for failable installer requirements * CHItA/ticket/14589: [ticket/14589] Fix grammatical errors in language strings [ticket/14589] Add error messages for failable installer requirements | ||||
| * | | | [ticket/14589] Fix grammatical errors in language strings | Máté Bartus | 2016-04-11 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | PHPBB3-14589 | ||||
| * | | | [ticket/14589] Add error messages for failable installer requirements | Máté Bartus | 2016-04-10 | 2 | -11/+19 |
| | | | | | | | | | | | | | | | | PHPBB3-14589 | ||||
* | | | | Merge pull request #4285 from CHItA/ticket/14590 | Marc Alexander | 2016-04-11 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | [ticket/14590] Prevent refresh requests after the last tasks in modules | ||||
| * | | | | [ticket/14590] Prevent refresh requests after the last tasks in modules | Máté Bartus | 2016-04-11 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | PHPBB3-14590 | ||||
* | | | | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-04-09 | 2 | -0/+99 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | [3.1.x] Increase version for 3.1.10 development | Joas Schilling | 2016-04-09 | 3 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'prep-release-3.1.9' into 3.1.x | Joas Schilling | 2016-04-09 | 8 | -9/+108 |
| |\ \ \ | |||||
| | * | | | [prep-release-3.1.9] Add changelog for 3.1.9-RC1 | Joas Schilling | 2016-04-09 | 1 | -1/+64 |
| | | | | | |||||
| | * | | | [prep-release-3.1.9] Add migration for 3.1.9-RC1 | Joas Schilling | 2016-04-09 | 1 | -0/+36 |
| | | | | | |||||
| | * | | | [prep-release-3.1.9] Update version to 3.1.9-RC1 | Joas Schilling | 2016-04-09 | 6 | -8/+8 |
| |/ / / | |||||
* | | | | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-04-08 | 1 | -7/+0 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | * 3.1.x: [ticket/14587] Remove sectionGroup from web.config | ||||
| * | | Merge pull request #4283 from DavidIQ/ticket/14587 | Joas Schilling | 2016-04-08 | 1 | -7/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14587] Remove sectionGroup from web.config * DavidIQ/ticket/14587: [ticket/14587] Remove sectionGroup from web.config | ||||
| | * | | [ticket/14587] Remove sectionGroup from web.config | David Colón | 2016-04-07 | 1 | -7/+0 |
| |/ / | | | | | | | | | | | | | | | | Causes errors on some IIS installations. PHPBB3-14587 | ||||
* | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-04-07 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #4256 from Nicofuma/ticket/13683 | Marc Alexander | 2016-04-07 | 2 | -18/+74 |
| |\ \ | | | | | | | | | | | | | [ticket/13683] Respects force_server_vars settings when generating URLs | ||||
* | \ \ | Merge pull request #4258 from Nicofuma/ticket/13683-3.2.x | Marc Alexander | 2016-04-07 | 3 | -19/+76 |
|\ \ \ \ | | | | | | | | | | | | | | | | [ticket/13683] Respects force_server_vars settings when generating URLs | ||||
| * \ \ \ | Merge branch 'ticket/13683' into ticket/13683-3.2.x | Tristan Darricau | 2016-04-03 | 1 | -9/+9 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13683: [ticket/13683] Fix CS | ||||
| | * | | | | [ticket/13683] Fix CS | Tristan Darricau | 2016-04-03 | 1 | -12/+11 |
| | | |/ / | | |/| | | | | | | | | | | | | PHPBB3-13683 | ||||
| * | | | | [ticket/13683] Removes extra / in script_path | Tristan Darricau | 2016-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13683 | ||||
| * | | | | Merge branch 'ticket/13683' into ticket/13683-3.2.x | Tristan Darricau | 2016-03-30 | 0 | -0/+0 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | * ticket/13683: [ticket/13683] Removes extra / in script_path | ||||
| | * | | | [ticket/13683] Removes extra / in script_path | Tristan Darricau | 2016-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13683 | ||||
| * | | | | [ticket/13683] Fix merge into 3.2.x | Tristan Darricau | 2016-03-29 | 2 | -10/+18 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13683 | ||||
| * | | | | Merge branch 'ticket/13683' into ticket/13683-3.2.x | Tristan Darricau | 2016-03-29 | 1 | -9/+58 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13683: [ticket/13683] Updates tests [ticket/13683] Fix more cases [ticket/13683] Respects force_server_vars settings when generating URLs | ||||
| | * | | | [ticket/13683] Updates tests | Tristan Darricau | 2016-03-29 | 2 | -10/+11 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13683 | ||||
| | * | | | [ticket/13683] Fix more cases | Tristan Darricau | 2016-03-29 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13683 | ||||
| | * | | | [ticket/13683] Respects force_server_vars settings when generating URLs | Tristan Darricau | 2016-03-29 | 2 | -17/+71 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13683 | ||||
* | | | | | Merge pull request #4280 from Nicofuma/ticket/14198 | Marc Alexander | 2016-04-06 | 1 | -2/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14198] Use the build option to calculate the container cache filename | ||||
| * | | | | | [ticket/14198] Use the build option to calculate the container cache filename | Tristan Darricau | 2016-04-04 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14198 | ||||
* | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-04-06 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | Conflicts: phpBB/install/database_update.php | ||||
| * | | | | Merge pull request #4279 from RMcGirr83/ticket_14408 | Marc Alexander | 2016-04-06 | 1 | -2/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14408] Remove span tags from file | ||||
| | * | | | | [ticket/14408] Remove span tags from file | Richard McGirr | 2016-04-04 | 1 | -2/+0 |
| |/ / / / | | | | | | | | | | | | | | | | PHPBB3-14408 | ||||
* | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-04-03 | 1 | -0/+3 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14559] Remove attachment BBCode tags from the quoted message | ||||
| * | | | | Merge pull request #4253 from rxu/ticket/14559 | Tristan Darricau | 2016-04-03 | 1 | -0/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14559] Remove attachment BBCode tags from the quoted message * rxu/ticket/14559: [ticket/14559] Remove attachment BBCode tags from the quoted message | ||||
| | * | | | | [ticket/14559] Remove attachment BBCode tags from the quoted message | rxu | 2016-03-27 | 1 | -0/+3 |
| | | |/ / | | |/| | | | | | | | | | | | | PHPBB3-14559 | ||||
* | | | | | Merge pull request #4248 from VSEphpbb/ticket/14561 | Tristan Darricau | 2016-04-03 | 12 | -119/+1045 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14561] Add more user commands * VSEphpbb/ticket/14561: [ticket/14561] Remove requires for functions in tests [ticket/14561] Small change to progress bar output [ticket/14561] Fix function docblock in activate command [ticket/14561] Add a progress bar to reclean command [ticket/14561] Use the user loader where appropriate [ticket/14561] Add extra help explaining reclean command [ticket/14561] Import classes with use statements [ticket/14561] Remove unused use statements [ticket/14561] Refactor tests [ticket/14561] Reclean usernames command [ticket/14561] User activate command [ticket/14561] User delete command | ||||
| * | | | | [ticket/14561] Remove requires for functions in tests | Matt Friedman | 2016-03-31 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-14561 | ||||
| * | | | | [ticket/14561] Small change to progress bar output | Matt Friedman | 2016-03-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-14561 | ||||
| * | | | | [ticket/14561] Fix function docblock in activate command | Matt Friedman | 2016-03-31 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-14561 | ||||
| * | | | | [ticket/14561] Add a progress bar to reclean command | Matt Friedman | 2016-03-31 | 3 | -8/+78 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-14561 |