Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3590 from rxu/ticket/13814 | Tristan Darricau | 2015-05-04 | 1 | -1/+1 |
|\ | |||||
| * | [ticket/13814] Prevent phpbb_is_writable() method from truncating files | rxu | 2015-05-04 | 1 | -1/+1 |
* | | Merge pull request #3589 from marc1706/ticket/13782 | Tristan Darricau | 2015-05-04 | 5 | -11/+11 |
|\ \ | |||||
| * | | [ticket/13782] Rename null log to dummy for PHP7 compatibility | Marc Alexander | 2015-05-04 | 1 | -2/+2 |
| * | | [ticket/13782] Rename null driver to dummy for PHP7 compatibility | Marc Alexander | 2015-05-04 | 4 | -9/+9 |
* | | | Merge branch '3.1.x' | Tristan Darricau | 2015-05-04 | 1 | -0/+7 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge pull request #3562 from VSEphpbb/ticket/11521 | Tristan Darricau | 2015-05-04 | 1 | -0/+7 |
| |\ \ | |||||
| | * | | [ticket/11521] Add missing lang strings for migration exceptions | Matt Friedman | 2015-04-28 | 1 | -0/+7 |
* | | | | Merge branch '3.1.x' | Joas Schilling | 2015-05-03 | 2 | -0/+36 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Joas Schilling | 2015-05-03 | 2 | -0/+36 |
| |\ \ \ | |||||
| | * | | | [prep-release-3.1.4] Add security issue to changelog | Joas Schilling | 2015-05-03 | 1 | -0/+4 |
| | * | | | [prep-release-3.1.4] Add migration | Joas Schilling | 2015-05-03 | 1 | -0/+32 |
| | * | | | [prep-release-3.1.4] Update version to 3.1.4 | Joas Schilling | 2015-05-03 | 2 | -2/+2 |
* | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-05-03 | 2 | -0/+41 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Andreas Fischer | 2015-05-03 | 2 | -0/+41 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4 | Andreas Fischer | 2015-05-03 | 2 | -0/+41 |
| | |\ \ \ | |||||
| | | * | | | [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. | Andreas Fischer | 2015-05-03 | 1 | -0/+4 |
| | | * | | | [prep-release-3.0.14] Bump version numbers for 3.0.14 release. | Andreas Fischer | 2015-05-03 | 3 | -3/+9 |
| | | * | | | Merge remote-tracking branch 'phpbb-security/ticket/security-180' into prep-r... | Andreas Fischer | 2015-04-28 | 1 | -1/+7 |
| | | |\ \ \ | |||||
* | | | | | | | [ticket/13762] Replace user service with lang in twig extension | MateBartus | 2015-05-02 | 2 | -7/+7 |
* | | | | | | | [ticket/13762] Optional DI injectable default language module array | MateBartus | 2015-05-02 | 1 | -5/+14 |
* | | | | | | | [ticket/13762] Moving language related functionality into a separate class | MateBartus | 2015-05-02 | 18 | -447/+1083 |
* | | | | | | | [ticket/13793] Remove translation on throwing exceptions | MateBartus | 2015-05-01 | 9 | -54/+29 |
* | | | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-29 | 1 | -0/+32 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Joas Schilling | 2015-04-29 | 1 | -0/+32 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | [prep-release-3.1.4] Increase version number to 3.1.4-RC2 | Joas Schilling | 2015-04-29 | 3 | -2/+34 |
* | | | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-04-28 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Andreas Fischer | 2015-04-28 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | [ticket/security-180] Use language variable for redirect error in 3.1+ | Marc Alexander | 2015-04-28 | 1 | -1/+1 |
| | * | | | | | Merge branch 'ticket/security-180' into ticket/security-180-asc | Marc Alexander | 2015-04-28 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | [ticket/security-180] Always fail when redirecting to an insecure URL | Joas Schilling | 2015-04-11 | 1 | -1/+1 |
| | * | | | | | [ticket/security-180] Merge if statement with previous one in 3.1.x | Marc Alexander | 2015-04-28 | 1 | -7/+1 |
| | * | | | | | Merge branch 'ticket/security-180' into ticket/security-180-asc | Marc Alexander | 2015-04-28 | 1 | -0/+6 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | [ticket/security-180] Make sure that redirect goes to full URL plus slash | Marc Alexander | 2015-04-11 | 1 | -1/+1 |
| | | * | | | | [ticket/security-180] Check if redirect URL contains board URL | Marc Alexander | 2015-04-10 | 1 | -0/+6 |
* | | | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-04-28 | 3 | -1/+64 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Andreas Fischer | 2015-04-28 | 3 | -1/+64 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4 | Andreas Fischer | 2015-04-28 | 3 | -1/+64 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | [3.0.x] Add changelog for 3.0.14 release. | Andreas Fischer | 2015-04-28 | 1 | -0/+26 |
| | | * | | | [3.0.x] Bump version numbers for 3.0.14-RC1 release. | Andreas Fischer | 2015-04-27 | 3 | -6/+18 |
| | | * | | | [3.0.x] Bumping version numbers to final for 3.0.14 releases. | Andreas Fischer | 2015-04-27 | 10 | -12/+12 |
* | | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-04-27 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge pull request #3557 from VSEphpbb/ticket/13778 | Andreas Fischer | 2015-04-27 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | [ticket/13778] Update wording of the reCaptcha instructions | Matt Friedman | 2015-04-26 | 1 | -1/+1 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-04-27 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver | Alexander Köplinger | 2015-04-26 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #3524 from marc1706/ticket/8672 | Tristan Darricau | 2015-04-27 | 11 | -54/+113 |
|\ \ \ \ \ | |||||
| * | | | | | [ticket/8672] Update hash of lock file | Marc Alexander | 2015-04-24 | 1 | -1/+1 |
| * | | | | | [ticket/8672] User $user->lang() instead of sprintf | Marc Alexander | 2015-04-24 | 1 | -2/+2 |
| * | | | | | [ticket/8672] Update fastImageSize to 1.0.2 | Marc Alexander | 2015-04-24 | 1 | -5/+5 |