aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | [ticket/14561] Use the user loader where appropriateMatt Friedman2016-03-316-40/+29
| | | | | | | | | | | | | | | | PHPBB3-14561
| * | | [ticket/14561] Add extra help explaining reclean commandMatt Friedman2016-03-312-0/+2
| | | | | | | | | | | | | | | | 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] Refactor testsMatt Friedman2016-03-316-297/+206
| | | | | | | | | | | | | | | | PHPBB3-14561
| * | | [ticket/14561] Reclean usernames commandMatt Friedman2016-03-314-0/+218
| | | | | | | | | | | | | | | | PHPBB3-14561
| * | | [ticket/14561] User activate commandMatt Friedman2016-03-314-0/+368
| | | | | | | | | | | | | | | | PHPBB3-14561
| * | | [ticket/14561] User delete commandMatt Friedman2016-03-314-0/+360
| | | | | | | | | | | | | | | | PHPBB3-14561
* | | | Merge pull request #4266 from marc1706/ticket/13502Tristan Darricau2016-04-033-15/+78
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Also cover passing object to resolver in testsMarc Alexander2016-04-012-1/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-13502
| * | | | [ticket/13502] Test getArguments() method of controller resolverMarc Alexander2016-04-012-12/+57
| | | | | | | | | | | | | | | | | | | | PHPBB3-13502
| * | | | [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
| * | | Merge pull request #4268 from marc1706/ticket/14532Tristan Darricau2016-04-031-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14532] Do not escape column default in mssql * marc1706/ticket/14532: [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 pull request #4277 from JoshyPHP/ticket/14260Tristan Darricau2016-04-032-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14260] Added regression test * JoshyPHP/ticket/14260: [ticket/14260] Added regression test
| * | | | | [ticket/14260] Added regression testJoshyPHP2016-04-032-0/+2
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-14260
* | | | | Merge branch 'ticket/14426' into 3.2.xMarc Alexander2016-04-031-0/+5
|\ \ \ \ \
| * | | | | [ticket/14426] Fixed undefined offset errorJoshyPHP2016-04-031-0/+5
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-14426
* | | | | Merge pull request #4271 from kasimi/ticket/14562-3.2.xTristan Darricau2016-04-021-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14562] Language fallback for extension permissions (3.2.x) * kasimi/ticket/14562-3.2.x: [ticket/14562] Language fallback for extension permissions (3.2.x)
| * | | | | [ticket/14562] Language fallback for extension permissions (3.2.x)kasimi2016-04-011-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-14562
* | | | | Revert "[ticket/14562] Language fallback for extension permissions"Tristan Darricau2016-04-021-31/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 621b958b1ca41e1def6349e07e0e3c8258a9d9f3.
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-04-021-2/+31
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * 3.1.x: [ticket/14562] Language fallback for extension permissions
| * | | | Merge pull request #4270 from kasimi/ticket/14562Tristan Darricau2016-04-021-2/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14562] Language fallback for extension permissions * kasimi/ticket/14562: [ticket/14562] Language fallback for extension permissions
| | * | | | [ticket/14562] Language fallback for extension permissionskasimi2016-04-011-2/+31
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-14562
* | | | | Merge pull request #4274 from marc1706/ticket/14495Tristan Darricau2016-04-027-11/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14495] Specify correct version numbers in 3.2.x * marc1706/ticket/14495: [ticket/14495] Specify correct version numbers in 3.2.x
| * | | | | [ticket/14495] Specify correct version numbers in 3.2.xMarc Alexander2016-04-027-11/+11
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT apply these changes into master when merging it. This means that you'll have to checkout the latest files from upstream after merging this into master (possibly while resolving likely merge conflicts). PHPBB3-14495
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-04-020-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | * 3.1.x:
| * | | | Merge pull request #4272 from marc1706/ticket/14577Tristan Darricau2016-04-025-12/+12
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/14577] Do not calculate size of array in for loop * marc1706/ticket/14577: [ticket/14577] Do not calculate size of array in for loop
* | | | | Merge pull request #4273 from marc1706/ticket/14577-3.2.xTristan Darricau2016-04-025-12/+12
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | [ticket/14577] Do not calculate size of array in for loop * marc1706/ticket/14577-3.2.x: [ticket/14577] Do not calculate size of array in for loop
| * | | | Merge branch 'ticket/14577' into ticket/14577-3.2.xMarc Alexander2016-04-025-12/+12
| |\ \ \ \ |/ / / / / | | | _ / | | | / | | | | Conflicts: phpBB/includes/acp/acp_modules.php
| * | | [ticket/14577] Do not calculate size of array in for loopMarc Alexander2016-04-025-12/+12
| |/ / | | | | | | | | | | | | | | | | | | For loops that modify the size of the looped arrays were obviously not changed. PHPBB3-14577
* | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 03:18:47 +0000