Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3564 from VSEphpbb/ticket/13516 | Nicofuma | 2015-05-04 | 1 | -1/+1 |
|\ | |||||
| * | [ticket/13516] Update image search script | Matt Friedman | 2015-05-04 | 1 | -1/+1 |
| * | [ticket/13516] Do not search ICC profiles in extension vendors | Matt Friedman | 2015-04-28 | 1 | -1/+1 |
* | | 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 pull request #3588 from nickvergessen/ticket/13809-asc | Nicofuma | 2015-05-03 | 3 | -24/+29 |
|\ \ | |||||
| * | | [ticket/13809] Test each file individually | Joas Schilling | 2015-05-03 | 1 | -21/+28 |
| * | | [ticket/13809] Perform the lint test prior to normal tests | Joas Schilling | 2015-05-03 | 2 | -3/+1 |
|/ / | |||||
* | | Merge branch 'prep-release-3.1.4' into 3.1.x | Joas Schilling | 2015-05-03 | 3 | -2/+38 |
|\ \ | |||||
| * | | [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 | 3 | -4/+4 |
* | | | Merge branch '3.0.x' into 3.1.x | Andreas Fischer | 2015-05-03 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | Merge branch 'prep-release-3.0.14' into 3.0.x | Andreas Fischer | 2015-05-03 | 2 | -1/+5 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'prep-release-3.1.4' into 3.1.x | Andreas Fischer | 2015-05-03 | 3 | -1/+42 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4 | Andreas Fischer | 2015-05-03 | 3 | -1/+42 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | [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 | 4 | -6/+12 |
* | | | | | Merge branch '3.0.x' into 3.1.x | Tristan Darricau | 2015-05-02 | 1 | -9/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge pull request #3575 from marc1706/ticket/13792 | Tristan Darricau | 2015-05-02 | 1 | -9/+1 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13792] Use hhvm instead of manually installing nightlys for now | Marc Alexander | 2015-05-01 | 1 | -9/+1 |
| |/ / / / | |||||
* | | | | | 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 | 4 | -4/+36 |
* | | | | | Merge branch '3.0.x' into 3.1.x | Andreas Fischer | 2015-04-28 | 0 | -0/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'prep-release-3.0.14' into 3.0.x | Andreas Fischer | 2015-04-28 | 2 | -3/+14 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge remote-tracking branch 'phpbb-security/ticket/security-180' into prep-r... | Andreas Fischer | 2015-04-28 | 2 | -3/+14 |
| | |\ \ \ | |||||
* | | \ \ \ | Merge branch 'prep-release-3.1.4' into 3.1.x | Andreas Fischer | 2015-04-28 | 2 | -5/+10 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge remote-tracking branch 'phpbb-security/ticket/security-180-asc' into pr... | Andreas Fischer | 2015-04-28 | 2 | -5/+10 |
| |\ \ \ \ \ | |||||
| | * | | | | | [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 | 2 | -5/+7 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | [ticket/security-180] Add tests for redirecting to main URL | Marc Alexander | 2015-04-23 | 1 | -0/+2 |
| | | * | | | | [ticket/security-180] Always fail when redirecting to an insecure URL | Joas Schilling | 2015-04-11 | 2 | -4/+4 |
| | * | | | | | [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 | 2 | -0/+9 |
| | |\ \ \ \ \ | |/ / / / / / | | | _ / / / | | | / / / | |||||
| | * | | | | [ticket/security-180] Make sure that redirect goes to full URL plus slash | Marc Alexander | 2015-04-11 | 2 | -1/+4 |
| | * | | | | [ticket/security-180] Check if redirect URL contains board URL | Marc Alexander | 2015-04-10 | 1 | -0/+6 |
* | | | | | | Merge branch '3.0.x' into 3.1.x | Andreas Fischer | 2015-04-28 | 0 | -0/+0 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | [3.0.x] Increment version number to 3.0.15-dev. | Andreas Fischer | 2015-04-28 | 4 | -6/+6 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Andreas Fischer | 2015-04-28 | 4 | -2/+65 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4 | Andreas Fischer | 2015-04-28 | 4 | -2/+65 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | [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 | 4 | -7/+19 |
| | * | | | [3.0.x] Bumping version numbers to final for 3.0.14 releases. | Andreas Fischer | 2015-04-27 | 10 | -12/+12 |
* | | | | | 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 pull request #3555 from akoeplinger/ticket/12101 | 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 #3532 from prototech/ticket/13755 | Marc Alexander | 2015-04-26 | 2 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | [ticket/13755] Ignore dots in path when determining file extension. | Cesar G | 2015-04-10 | 2 | -0/+4 |
* | | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Andreas Fischer | 2015-04-25 | 0 | -0/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | |