aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* [ticket/14198] Use the build option to calculate the container cache filenameTristan Darricau2016-04-041-2/+14
* Merge pull request #4248 from VSEphpbb/ticket/14561Tristan Darricau2016-04-034-13/+605
|\
| * [ticket/14561] Small change to progress bar outputMatt Friedman2016-03-311-1/+1
| * [ticket/14561] Fix function docblock in activate commandMatt Friedman2016-03-311-2/+1
| * [ticket/14561] Add a progress bar to reclean commandMatt Friedman2016-03-311-2/+74
| * [ticket/14561] Use the user loader where appropriateMatt Friedman2016-03-312-40/+22
| * [ticket/14561] Add extra help explaining reclean commandMatt Friedman2016-03-311-0/+1
| * [ticket/14561] Import classes with use statementsMatt Friedman2016-03-314-46/+68
| * [ticket/14561] Remove unused use statementsMatt Friedman2016-03-313-7/+0
| * [ticket/14561] Reclean usernames commandMatt Friedman2016-03-311-0/+125
| * [ticket/14561] User activate commandMatt Friedman2016-03-311-0/+223
| * [ticket/14561] User delete commandMatt Friedman2016-03-311-0/+175
* | Merge pull request #4266 from marc1706/ticket/13502Tristan Darricau2016-04-031-3/+15
|\ \
| * | [ticket/13502] Fix coding styleMarc Alexander2016-04-011-2/+5
| * | [ticket/13502] Controller resolver should handle callable functions and objectsRFD2016-04-011-3/+12
| |/
* | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-04-031-1/+1
|\ \
| * | [ticket/14532] Do not escape column default in mssqlMarc Alexander2016-03-311-1/+1
* | | Merge branch 'ticket/14577' into ticket/14577-3.2.xMarc Alexander2016-04-021-1/+1
|\ \ \ | |/ / | | / | |/ |/|
* | Merge pull request #4255 from CHItA/ticket/14393Tristan Darricau2016-03-313-11/+14
|\ \
| * | [ticket/14393] Fix db update progress barMáté Bartus2016-03-301-2/+1
| * | [ticket/14393] Fix init for conflict archiveMáté Bartus2016-03-271-7/+6
| * | [ticket/14393] Fix updater behaviourMáté Bartus2016-03-273-4/+9
* | | 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] Use phpbb_version_compareMatt Friedman2016-03-2932-32/+32
| | * | [ticket/14570] Add effectively installed to 3.1.x versionsMatt Friedman2016-03-2932-0/+160
| * | | Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-277-19/+19
| |\ \ \
* | | | | [ticket/14572] Fix quote notification deletionGreg Ryckman2016-03-301-2/+2
* | | | | [ticket/14564] Fix cookie domain calculationMáté Bartus2016-03-271-1/+8
* | | | | Merge pull request #4251 from marc1706/ticket/14272-3.2.xTristan Darricau2016-03-277-19/+19
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-277-19/+19
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | |
| | * | | [ticket/14272] Fix invalid or missing min/max settingsMarc Alexander2015-11-061-2/+2
| | * | | [ticket/14272] Only use maxlength and size for allowed input elementsMarc Alexander2015-11-067-19/+19
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-272-2/+10
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge pull request #4182 from marc1706/ticket/14481Tristan Darricau2016-03-272-2/+10
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/14481] Respect HTTP_X_FORWARDED headers for implying httpsMarc Alexander2016-02-152-2/+10
* | | | Merge pull request #4199 from VSEphpbb/ticket/12684Tristan Darricau2016-03-261-0/+328
|\ \ \ \
| * | | | [ticket/12684] Use a switch statement for readabilityMatt Friedman2016-03-211-13/+13
| * | | | [ticket/12684] Use interactive method correctlyMatt Friedman2016-03-091-30/+25
| * | | | [ticket/12684] Extract interactivity to a methodMatt Friedman2016-03-091-37/+52
| * | | | [ticket/12684] Add extended help for the user:add commandMatt Friedman2016-03-081-0/+1
| * | | | [ticket/12684] Add shorthand alternates to the optionsMatt Friedman2016-03-081-3/+3
| * | | | [ticket/12684] Remove whitespaceMatt Friedman2016-03-051-1/+1
| * | | | [ticket/12684] Add an error on user creation failureMatt Friedman2016-03-051-0/+6
| * | | | [ticket/12684] Remove unnecessary null argumentsMatt Friedman2016-02-291-2/+2
| * | | | [ticket/12684] Additional clean upMatt Friedman2016-02-291-9/+4
| * | | | [ticket/12684] Allowed to use $this in enclosureMatt Friedman2016-02-291-4/+3
| * | | | [ticket/12684] Move all lang keys to cliMatt Friedman2016-02-291-1/+1
| * | | | [ticket/12684] Fix a few mistakes and clean it upMatt Friedman2016-02-291-8/+24
| * | | | [ticket/12684] Some code clean upMatt Friedman2016-02-291-12/+1