aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge pull request #4277 from JoshyPHP/ticket/14260Tristan Darricau2016-04-032-0/+2
|\ \ \
| * | | [ticket/14260] Added regression testJoshyPHP2016-04-032-0/+2
|/ / /
* | | Merge branch 'ticket/14426' into 3.2.xMarc Alexander2016-04-031-0/+5
|\ \ \
| * | | [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 '3.1.x' into 3.2.xTristan Darricau2016-04-020-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #4272 from marc1706/ticket/14577Tristan Darricau2016-04-025-12/+12
| |\ \ \ | | |_|/ | |/| |
* | | | Merge pull request #4273 from marc1706/ticket/14577-3.2.xTristan Darricau2016-04-025-12/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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 pull request #4269 from VSEphpbb/ticket/14576Tristan Darricau2016-03-31141-289/+10
|\ \ \
| * | | [ticket/14576] Move common required files to bootstrapMatt Friedman2016-03-31141-289/+10
|/ / /
* | | 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 #4267 from GregRyckman/ticket/14572Marc Alexander2016-03-301-2/+2
|\ \ \ \
| * | | | [ticket/14572] Fix quote notification deletionGreg Ryckman2016-03-301-2/+2
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-301-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #4259 from Nicofuma/ticket/14565Marc Alexander2016-03-302-0/+5
| |\ \ \
| | * | | [ticket/14565] Workaround for php 5.3.3Tristan Darricau2016-03-291-0/+5
| | * | | [ticket/14565] Updates composer.phar to 1.0.0-beta2Tristan Darricau2016-03-271-0/+0
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-301-6/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4262 from Senky/ticket/10356Marc Alexander2016-03-301-6/+7
| |\ \ \ \
| | * | | | [ticket/10356] Find inactive users in livesearch when having permissionsJakub Senko2016-03-291-6/+7
| |/ / / /
* | | | | Merge branch '3.1.x' into 3.2.xMáté Bartus2016-03-282-7/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4260 from VSEphpbb/ticket/14568Máté Bartus2016-03-282-7/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/14568] Update the repository readmeMatt Friedman2016-03-282-7/+7
| | |/ /
* | | | Merge pull request #4257 from CHItA/ticket/14564Marc Alexander2016-03-281-1/+8
|\ \ \ \
| * | | | [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 branch '3.1.x' into 3.2.xTristan Darricau2016-03-270-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-2739-93/+139
| |\ \ \ \
* | \ \ \ \ Merge pull request #4251 from marc1706/ticket/14272-3.2.xTristan Darricau2016-03-2733-87/+130
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-2733-87/+130
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | / | | |_|_|_|/ | |/| | | |