aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-282-0/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | _ / / / / / / / / / / | | | | / / / / / / / / / /
| | | * | | | | | | | | | | [ticket/security-180] Make sure that redirect goes to full URL plus slashMarc Alexander2015-04-112-1/+4
| | | * | | | | | | | | | | [ticket/security-180] Check if redirect URL contains board URLMarc Alexander2015-04-101-0/+6
* | | | | | | | | | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-04-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | [3.0.x] Increment version number to 3.0.15-dev.Andreas Fischer2015-04-284-6/+6
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-284-2/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | / / / / / / / | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-284-2/+65
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | / / / / | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-284-2/+65
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | [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-274-7/+19
| | | * | | | | | | | [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
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #3555 from akoeplinger/ticket/12101Andreas 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-2724-57/+220
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/8672] Update hash of lock fileMarc Alexander2015-04-241-1/+1
| * | | | | | | | | | [ticket/8672] User $user->lang() instead of sprintfMarc Alexander2015-04-242-3/+3
| * | | | | | | | | | [ticket/8672] Remove unnecessary lines from clean-vendor-dirMarc Alexander2015-04-241-9/+0
| * | | | | | | | | | [ticket/8672] Update fastImageSize to 1.0.2Marc Alexander2015-04-241-5/+5
| * | | | | | | | | | [ticket/8672] Add fastImageSize to clean-vendor-dir in build.xmlMarc Alexander2015-04-241-0/+9
| * | | | | | | | | | [ticket/8672] Update fastImageSize to 1.0.1Marc Alexander2015-04-241-5/+5
| * | | | | | | | | | [ticket/8672] Remove outdated imagesize classMarc Alexander2015-04-241-549/+0
| * | | | | | | | | | [ticket/8672] Use fastImageSize in classesMarc Alexander2015-04-2410-18/+18
| * | | | | | | | | | [ticket/8672] Add fast-image-size library to composer.jsonMarc Alexander2015-04-242-0/+52
| * | | | | | | | | | [ticket/8672] Updated the text_formatter.s9e serviceJoshyPHP2015-04-242-9/+9
| * | | | | | | | | | [ticket/8672] Add class for retrieving imagesize without downloadMarc Alexander2015-04-2420-46/+706
* | | | | | | | | | | Merge pull request #3548 from s9e/ticket/12745Andreas Fischer2015-04-263-21/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ticket/12745] Added HTML entity testJoshyPHP2015-04-251-0/+10
| * | | | | | | | | | | [ticket/12745] Added support for Unicode characters outside BMPJoshyPHP2015-04-252-17/+10
| * | | | | | | | | | | [ticket/12745] Updated s9e\TextFormatterJoshyPHP2015-04-251-4/+4
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-04-262-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #3532 from prototech/ticket/13755Marc Alexander2015-04-262-0/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | [ticket/13755] Ignore dots in path when determining file extension.Cesar G2015-04-102-0/+4
* | | | | | | | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge pull request #3550 from bantu/ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| | |\ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ Merge branch '3.1.x'Andreas Fischer2015-04-251-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | / / / / / / / / | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-04-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge pull request #3549 from bantu/ticket/13765Andreas Fischer2015-04-252-2/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #3550 from bantu/ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'ticket/13765' into ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| / / / / / / / | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.Joas Schilling2015-04-252-2/+2
| | | |/ / / / / / /
* | | | | | | | | | Merge pull request #3541 from s9e/ticket/13767Andreas Fischer2015-04-221-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/13767] Remove vendor/s9e/text-formatter/.git during buildJoshyPHP2015-04-191-0/+2
* | | | | | | | | | | Merge pull request #3547 from s9e/ticket/13774Andreas Fischer2015-04-221-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ticket/13774] Updated s9e\TextFormatterJoshyPHP2015-04-221-4/+4
|/ / / / / / / / / / /