aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3590 from rxu/ticket/13814Tristan Darricau2015-05-041-1/+1
|\
| * [ticket/13814] Prevent phpbb_is_writable() method from truncating filesrxu2015-05-041-1/+1
* | Merge pull request #3589 from marc1706/ticket/13782Tristan Darricau2015-05-045-11/+11
|\ \
| * | [ticket/13782] Rename null log to dummy for PHP7 compatibilityMarc Alexander2015-05-041-2/+2
| * | [ticket/13782] Rename null driver to dummy for PHP7 compatibilityMarc Alexander2015-05-044-9/+9
* | | Merge branch '3.1.x'Tristan Darricau2015-05-041-0/+7
|\ \ \ | |/ / |/| |
| * | Merge pull request #3562 from VSEphpbb/ticket/11521Tristan Darricau2015-05-041-0/+7
| |\ \
| | * | [ticket/11521] Add missing lang strings for migration exceptionsMatt Friedman2015-04-281-0/+7
* | | | Merge branch '3.1.x'Joas Schilling2015-05-032-0/+36
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-032-0/+36
| |\ \ \
| | * | | [prep-release-3.1.4] Add security issue to changelogJoas Schilling2015-05-031-0/+4
| | * | | [prep-release-3.1.4] Add migrationJoas Schilling2015-05-031-0/+32
| | * | | [prep-release-3.1.4] Update version to 3.1.4Joas Schilling2015-05-032-2/+2
* | | | | Merge branch '3.1.x'Andreas Fischer2015-05-032-0/+41
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-05-032-0/+41
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-032-0/+41
| | |\ \ \
| | | * | | [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.Andreas Fischer2015-05-031-0/+4
| | | * | | [prep-release-3.0.14] Bump version numbers for 3.0.14 release.Andreas Fischer2015-05-033-3/+9
| | | * | | Merge remote-tracking branch 'phpbb-security/ticket/security-180' into prep-r...Andreas Fischer2015-04-281-1/+7
| | | |\ \ \
* | | | | | | [ticket/13762] Replace user service with lang in twig extensionMateBartus2015-05-022-7/+7
* | | | | | | [ticket/13762] Optional DI injectable default language module arrayMateBartus2015-05-021-5/+14
* | | | | | | [ticket/13762] Moving language related functionality into a separate classMateBartus2015-05-0218-447/+1083
* | | | | | | [ticket/13793] Remove translation on throwing exceptionsMateBartus2015-05-019-54/+29
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-04-291-0/+32
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-04-291-0/+32
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | [prep-release-3.1.4] Increase version number to 3.1.4-RC2Joas Schilling2015-04-293-2/+34
* | | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-281-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-281-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | [ticket/security-180] Use language variable for redirect error in 3.1+Marc Alexander2015-04-281-1/+1
| | * | | | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-281-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | [ticket/security-180] Always fail when redirecting to an insecure URLJoas Schilling2015-04-111-1/+1
| | * | | | | [ticket/security-180] Merge if statement with previous one in 3.1.xMarc Alexander2015-04-281-7/+1
| | * | | | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-281-0/+6
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | [ticket/security-180] Make sure that redirect goes to full URL plus slashMarc Alexander2015-04-111-1/+1
| | | * | | | [ticket/security-180] Check if redirect URL contains board URLMarc Alexander2015-04-101-0/+6
* | | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-283-1/+64
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-283-1/+64
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-283-1/+64
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | [3.0.x] Add changelog for 3.0.14 release.Andreas Fischer2015-04-281-0/+26
| | | * | | [3.0.x] Bump version numbers for 3.0.14-RC1 release.Andreas Fischer2015-04-273-6/+18
| | | * | | [3.0.x] Bumping version numbers to final for 3.0.14 releases.Andreas Fischer2015-04-2710-12/+12
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-271-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3557 from VSEphpbb/ticket/13778Andreas Fischer2015-04-271-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/13778] Update wording of the reCaptcha instructionsMatt Friedman2015-04-261-1/+1
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-271-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserverAlexander Köplinger2015-04-261-1/+1
| |/ / / /
* | | | | Merge pull request #3524 from marc1706/ticket/8672Tristan Darricau2015-04-2711-54/+113
|\ \ \ \ \
| * | | | | [ticket/8672] Update hash of lock fileMarc Alexander2015-04-241-1/+1
| * | | | | [ticket/8672] User $user->lang() instead of sprintfMarc Alexander2015-04-241-2/+2
| * | | | | [ticket/8672] Update fastImageSize to 1.0.2Marc Alexander2015-04-241-5/+5