aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/14198] Use the build option to calculate the container cache filenameTristan Darricau2016-04-041-2/+14
* Merge branch '3.1.x' into 3.2.xTristan Darricau2016-04-031-0/+3
|\
| * Merge pull request #4253 from rxu/ticket/14559Tristan Darricau2016-04-031-0/+3
| |\
| | * [ticket/14559] Remove attachment BBCode tags from the quoted messagerxu2016-03-271-0/+3
* | | Merge pull request #4248 from VSEphpbb/ticket/14561Tristan Darricau2016-04-036-13/+661
|\ \ \
| * | | [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-312-3/+76
| * | | [ticket/14561] Use the user loader where appropriateMatt Friedman2016-03-313-40/+24
| * | | [ticket/14561] Add extra help explaining reclean commandMatt Friedman2016-03-312-0/+2
| * | | [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-313-0/+140
| * | | [ticket/14561] User activate commandMatt Friedman2016-03-313-0/+244
| * | | [ticket/14561] User delete commandMatt Friedman2016-03-313-0/+191
* | | | 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
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #4268 from marc1706/ticket/14532Tristan Darricau2016-04-031-1/+1
| |\ \ \
| | * | | [ticket/14532] Do not escape column default in mssqlMarc Alexander2016-03-311-1/+1
* | | | | [ticket/14426] Fixed undefined offset errorJoshyPHP2016-04-031-0/+5
* | | | | 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)kasimi2016-04-011-2/+2
| | |_|/ / | |/| | |
* | | | | Revert "[ticket/14562] Language fallback for extension permissions"Tristan Darricau2016-04-021-31/+2
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-04-021-2/+31
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4270 from kasimi/ticket/14562Tristan Darricau2016-04-021-2/+31
| |\ \ \ \
| | * | | | [ticket/14562] Language fallback for extension permissionskasimi2016-04-011-2/+31
| | | |/ / | | |/| |
* | | | | Merge pull request #4274 from marc1706/ticket/14495Tristan Darricau2016-04-027-11/+11
|\ \ \ \ \
| * | | | | [ticket/14495] Specify correct version numbers in 3.2.xMarc Alexander2016-04-027-11/+11
| | |_|/ / | |/| | |
* | | | | Merge branch 'ticket/14577' into ticket/14577-3.2.xMarc Alexander2016-04-025-12/+12
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | [ticket/14577] Do not calculate size of array in for loopMarc Alexander2016-04-025-12/+12
| |/ /
* | | 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
* | | | | [ticket/14572] Fix quote notification deletionGreg Ryckman2016-03-301-2/+2
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-301-6/+7
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/10356] Find inactive users in livesearch when having permissionsJakub Senko2016-03-291-6/+7
| | |_|/ | |/| |
| * | | Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-2738-89/+135
| |\ \ \
* | | | | [ticket/14564] Fix cookie domain calculationMáté Bartus2016-03-271-1/+8
* | | | | Merge pull request #4252 from RMcGirr83/ticket_14329Tristan Darricau2016-03-271-0/+10
|\ \ \ \ \
| * | | | | [ticket/14329] Add missing ACP language varsRichard McGirr2016-03-271-0/+10
* | | | | | Merge pull request #4251 from marc1706/ticket/14272-3.2.xTristan Darricau2016-03-2732-83/+126
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-2732-83/+126
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | [ticket/14272] Allow input of floats for filesizeMarc Alexander2016-02-032-2/+2