aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4286 from VSEphpbb/ticket/14569Marc Alexander2016-04-235-131/+48
|\ | | | | | | [ticket/14569] Extract CLI progress bar creation to a method
| * [ticket/14569] Extract CLI progress bar creation to a methodMatt Friedman2016-04-125-131/+48
| | | | | | | | PHPBB3-14569
* | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-04-161-0/+36
|\ \
| * | [prep-release-3.1.9] Add migration for 3.1.9Joas Schilling2016-04-161-0/+36
| | |
* | | [ticket/14589] Fix @var usageMáté Bartus2016-04-132-2/+2
| | | | | | | | | | | | PHPBB3-14589
* | | Merge pull request #4236 from Nicofuma/ticket/13616Máté Bartus2016-04-134-23/+17
|\ \ \ | | | | | | | | [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer
| * | | [ticket/13616] Fix CS + constant in the core extensionTristan Darricau2016-04-031-2/+4
| | | | | | | | | | | | | | | | PHPBB3-13616
| * | | [ticket/13616] Fix UI testsTristan Darricau2016-04-031-0/+3
| | | | | | | | | | | | | | | | PHPBB3-13616
| * | | [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexerTristan Darricau2016-04-033-23/+12
| | | | | | | | | | | | | | | | PHPBB3-13616
* | | | Merge pull request #4284 from CHItA/ticket/14589Tristan Darricau2016-04-121-2/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | [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] Add error messages for failable installer requirementsMáté Bartus2016-04-101-2/+6
| | | | | | | | | | | | | | | | PHPBB3-14589
* | | | [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-091-0/+36
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | [prep-release-3.1.9] Add migration for 3.1.9-RC1Joas Schilling2016-04-091-0/+36
| | |
| * | Merge pull request #4256 from Nicofuma/ticket/13683Marc Alexander2016-04-071-2/+12
| |\ \ | | | | | | | | | | | | [ticket/13683] Respects force_server_vars settings when generating URLs
* | \ \ Merge pull request #4258 from Nicofuma/ticket/13683-3.2.xMarc Alexander2016-04-072-10/+19
|\ \ \ \ | | | | | | | | | | | | | | | [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
| | * | | [ticket/13683] Updates testsTristan Darricau2016-03-291-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| | * | | [ticket/13683] Fix more casesTristan Darricau2016-03-291-3/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| | * | | [ticket/13683] Respects force_server_vars settings when generating URLsTristan Darricau2016-03-291-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| * | | | [ticket/13683] Removes extra / in script_pathTristan Darricau2016-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| * | | | [ticket/13683] Fix merge into 3.2.xTristan Darricau2016-03-291-1/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-13683
* | | | | [ticket/14198] Use the build option to calculate the container cache filenameTristan Darricau2016-04-041-2/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-14198
* | | | | Merge pull request #4248 from VSEphpbb/ticket/14561Tristan Darricau2016-04-034-13/+605
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] 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-311-2/+74
| | | | | | | | | | | | | | | | | | | | PHPBB3-14561
| * | | | [ticket/14561] Use the user loader where appropriateMatt Friedman2016-03-312-40/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-14561
| * | | | [ticket/14561] Add extra help explaining reclean commandMatt Friedman2016-03-311-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14561
| * | | | [ticket/14561] Import classes with use statementsMatt Friedman2016-03-314-46/+68
| | | | | | | | | | | | | | | | | | | | PHPBB3-14561
| * | | | [ticket/14561] Remove unused use statementsMatt Friedman2016-03-313-7/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-14561
| * | | | [ticket/14561] Reclean usernames commandMatt Friedman2016-03-311-0/+125
| | | | | | | | | | | | | | | | | | | | PHPBB3-14561
| * | | | [ticket/14561] User activate commandMatt Friedman2016-03-311-0/+223
| | | | | | | | | | | | | | | | | | | | PHPBB3-14561
| * | | | [ticket/14561] User delete commandMatt Friedman2016-03-311-0/+175
| | | | | | | | | | | | | | | | | | | | PHPBB3-14561
* | | | | Merge pull request #4266 from marc1706/ticket/13502Tristan Darricau2016-04-031-3/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13502] Handle callable functions/objects in controller resolver * marc1706/ticket/13502: [ticket/13502] Also cover passing object to resolver in tests [ticket/13502] Test getArguments() method of controller resolver [ticket/13502] Fix coding style [ticket/13502] Controller resolver should handle callable functions and objects
| * | | | | [ticket/13502] Fix coding styleMarc Alexander2016-04-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13502
| * | | | | [ticket/13502] Controller resolver should handle callable functions and objectsRFD2016-04-011-3/+12
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13502
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-04-031-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * 3.1.x: [ticket/14532] Do not escape column default in mssql
| * | | | [ticket/14532] Do not escape column default in mssqlMarc Alexander2016-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The column default shouldn't be escaped for mssql. This is a regression from 743d816631292a2081af4c5f7fc2fad2aff17c58. Prior to that commit, the default value for the column was not escaped. Escaping it will cause SQL errors while altering columns. PHPBB3-14532
* | | | | Merge branch 'ticket/14577' into ticket/14577-3.2.xMarc Alexander2016-04-021-1/+1
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | Conflicts: phpBB/includes/acp/acp_modules.php
* | | | Merge pull request #4255 from CHItA/ticket/14393Tristan Darricau2016-03-313-11/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14393] Fix updater behaviour * CHItA/ticket/14393: [ticket/14393] Fix db update progress bar [ticket/14393] Fix init for conflict archive [ticket/14393] Fix updater behaviour
| * | | | [ticket/14393] Fix db update progress barMáté Bartus2016-03-301-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14393
| * | | | [ticket/14393] Fix init for conflict archiveMáté Bartus2016-03-271-7/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-14393
| * | | | [ticket/14393] Fix updater behaviourMáté Bartus2016-03-273-4/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-14393
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-3132-0/+160
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4264 from VSEphpbb/ticket/14570Marc Alexander2016-03-3132-0/+160
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | [ticket/14570] Add effectively installed to 3.1.x versions
| | * | | [ticket/14570] Use phpbb_version_compareMatt Friedman2016-03-2932-32/+32
| | | | | | | | | | | | | | | | | | | | PHPBB3-14570
| | * | | [ticket/14570] Add effectively installed to 3.1.x versionsMatt Friedman2016-03-2932-0/+160
| | | | | | | | | | | | | | | | | | | | PHPBB3-14570