aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / / / / /
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-221-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #3546 from brunoais/ticket/13772Andreas Fischer2015-04-221-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()brunoais2015-04-211-1/+1
| |/ / / / /
* | | | | | Merge pull request #3544 from Nicofuma/ticket/13768Andreas Fischer2015-04-224-148/+188
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [ticket/13768] Fix deprecationsTristan Darricau2015-04-192-3/+3
| * | | | | [ticket/13768] Update to symfony 2.8.*@devTristan Darricau2015-04-192-145/+185
|/ / / / /
* | | | | Merge pull request #3539 from MateBartus/ticket/13766Tristan Darricau2015-04-171-1/+1
|\ \ \ \ \
| * | | | | [ticket/13766] Add style_parent_id in textformater's data_access::get_styles()MateBartus2015-04-161-1/+1
* | | | | | Merge pull request #3446 from MateBartus/ticket/13654Tristan Darricau2015-04-1626-343/+1208
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/13654] Moving reporting into controllerMateBartus2015-04-1626-343/+1208
* | | | | | Merge pull request #3487 from MateBartus/ticket/13697Tristan Darricau2015-04-1682-658/+1860
|\ \ \ \ \ \
| * | | | | | [ticket/13697] Moving filesystem related functions to filesystem serviceMateBartus2015-04-1682-658/+1860
* | | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-161-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Merge pull request #3537 from RMcGirr83/ticket/13763Andreas Fischer2015-04-161-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/13763] Fix typo in extension lang fileRichard McGirr2015-04-151-1/+1
| |/ / / / /
* | | | | | Merge branch '3.1.x'Dhruv2015-04-142-2/+55
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3533 from Elsensee/ticket/13756Dhruv Goel2015-04-142-2/+55
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | [ticket/13756] Add test for generate_resize_string()Oliver Schramm2015-04-121-0/+53