aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMáté Bartus2016-04-131-41/+52
|\ | | | | | | | | * 3.1.x: [ticket/14598] Support vars docblock in sniffer
| * Merge pull request #4287 from Nicofuma/ticket/14598Máté Bartus2016-04-131-41/+52
| |\ | | | | | | [ticket/14598] Support vars docblock in sniffer
| | * [ticket/14598] Support vars docblock in snifferTristan Darricau2016-04-121-41/+52
| |/ | | | | | | PHPBB3-14598
* | Merge pull request #4236 from Nicofuma/ticket/13616Máté Bartus2016-04-1323-50/+354
|\ \ | | | | | | [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer
| * | [ticket/13616] Fix CS + constant in the core extensionTristan Darricau2016-04-033-4/+8
| | | | | | | | | | | | PHPBB3-13616
| * | [ticket/13616] Fix UI testsTristan Darricau2016-04-035-4/+17
| | | | | | | | | | | | PHPBB3-13616
| * | [ticket/13616] Cleanup globals after installing the board in func testsTristan Darricau2016-04-031-2/+10
| | | | | | | | | | | | PHPBB3-13616
| * | [ticket/13616] Updates direct call to twig environment constructorTristan Darricau2016-04-039-16/+7
| | | | | | | | | | | | PHPBB3-13616
| * | [ticket/13616] Uses a php 5.4 compatible versionTristan Darricau2016-04-031-3/+3
| | | | | | | | | | | | PHPBB3-13616
| * | [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexerTristan Darricau2016-04-038-28/+316
| | | | | | | | | | | | PHPBB3-13616
* | | Merge pull request #4284 from CHItA/ticket/14589Tristan Darricau2016-04-122-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 stringsMáté Bartus2016-04-111-6/+6
| | | | | | | | | | | | | | | | PHPBB3-14589
| * | | [ticket/14589] Add error messages for failable installer requirementsMáté Bartus2016-04-102-11/+19
| | | | | | | | | | | | | | | | PHPBB3-14589
* | | | Merge pull request #4285 from CHItA/ticket/14590Marc Alexander2016-04-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14590] Prevent refresh requests after the last tasks in modules
| * | | | [ticket/14590] Prevent refresh requests after the last tasks in modulesMáté Bartus2016-04-111-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-14590
* | | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-04-092-0/+99
|\ \ \ \ | | |_|/ | |/| |
| * | | [3.1.x] Increase version for 3.1.10 developmentJoas Schilling2016-04-093-3/+3
| | | |
| * | | Merge branch 'prep-release-3.1.9' into 3.1.xJoas Schilling2016-04-098-9/+108
| |\ \ \
| | * | | [prep-release-3.1.9] Add changelog for 3.1.9-RC1Joas Schilling2016-04-091-1/+64
| | | | |
| | * | | [prep-release-3.1.9] Add migration for 3.1.9-RC1Joas Schilling2016-04-091-0/+36
| | | | |
| | * | | [prep-release-3.1.9] Update version to 3.1.9-RC1Joas Schilling2016-04-096-8/+8
| |/ / /
* | | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-04-081-7/+0
|\ \ \ \ | |/ / / | | / / | |/ / |/| | * 3.1.x: [ticket/14587] Remove sectionGroup from web.config
| * | Merge pull request #4283 from DavidIQ/ticket/14587Joas Schilling2016-04-081-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.configDavid Colón2016-04-071-7/+0
| |/ / | | | | | | | | | | | | | | | Causes errors on some IIS installations. PHPBB3-14587
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-04-070-0/+0
|\ \ \ | |/ /
| * | Merge pull request #4256 from Nicofuma/ticket/13683Marc Alexander2016-04-072-18/+74
| |\ \ | | | | | | | | | | | | [ticket/13683] Respects force_server_vars settings when generating URLs
* | \ \ Merge pull request #4258 from Nicofuma/ticket/13683-3.2.xMarc Alexander2016-04-073-19/+76
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13683] Respects force_server_vars settings when generating URLs
| * \ \ \ Merge branch 'ticket/13683' into ticket/13683-3.2.xTristan Darricau2016-04-031-9/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13683: [ticket/13683] Fix CS
| | * | | | [ticket/13683] Fix CSTristan Darricau2016-04-031-12/+11
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-13683
| * | | | [ticket/13683] Removes extra / in script_pathTristan Darricau2016-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| * | | | Merge branch 'ticket/13683' into ticket/13683-3.2.xTristan Darricau2016-03-300-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * ticket/13683: [ticket/13683] Removes extra / in script_path
| | * | | [ticket/13683] Removes extra / in script_pathTristan Darricau2016-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| * | | | [ticket/13683] Fix merge into 3.2.xTristan Darricau2016-03-292-10/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| * | | | Merge branch 'ticket/13683' into ticket/13683-3.2.xTristan Darricau2016-03-291-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 testsTristan Darricau2016-03-292-10/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| | * | | [ticket/13683] Fix more casesTristan Darricau2016-03-292-4/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| | * | | [ticket/13683] Respects force_server_vars settings when generating URLsTristan Darricau2016-03-292-17/+71
| | | | | | | | | | | | | | | | | | | | PHPBB3-13683
* | | | | Merge pull request #4280 from Nicofuma/ticket/14198Marc Alexander2016-04-061-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 filenameTristan Darricau2016-04-041-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14198
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-04-060-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | Conflicts: phpBB/install/database_update.php
| * | | | Merge pull request #4279 from RMcGirr83/ticket_14408Marc Alexander2016-04-061-2/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14408] Remove span tags from file
| | * | | | [ticket/14408] Remove span tags from fileRichard McGirr2016-04-041-2/+0
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-14408
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-04-031-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14559] Remove attachment BBCode tags from the quoted message
| * | | | Merge pull request #4253 from rxu/ticket/14559Tristan Darricau2016-04-031-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 messagerxu2016-03-271-0/+3
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-14559
* | | | | Merge pull request #4248 from VSEphpbb/ticket/14561Tristan Darricau2016-04-0312-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 testsMatt Friedman2016-03-311-4/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-14561
| * | | | [ticket/14561] Small change to progress bar outputMatt Friedman2016-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14561
| * | | | [ticket/14561] Fix function docblock in activate commandMatt Friedman2016-03-311-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14561
| * | | | [ticket/14561] Add a progress bar to reclean commandMatt Friedman2016-03-313-8/+78
| | | | | | | | | | | | | | | | | | | | PHPBB3-14561