aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10922] Replaced urlencode() with rawurlencode()JoshyPHP2015-04-282-2/+2
| | | | | | | RFC-6068 asks for percent-encoding so that seems more correct. Not sure about that one. PHPBB3-10922
* [ticket/10922] Added support for body and subject in email BBCodeJoshyPHP2015-04-283-4/+19
| | | | PHPBB3-10922
* Merge branch '3.1.x'Andreas Fischer2015-04-271-1/+1
|\ | | | | | | | | * 3.1.x: [ticket/13778] Update wording of the reCaptcha instructions
| * Merge pull request #3557 from VSEphpbb/ticket/13778Andreas Fischer2015-04-271-1/+1
| |\ | | | | | | | | | | | | | | | | | | [ticket/13778] Update wording of the reCaptcha instructions * VSEphpbb/ticket/13778: [ticket/13778] Update wording of the reCaptcha instructions
| | * [ticket/13778] Update wording of the reCaptcha instructionsMatt Friedman2015-04-261-1/+1
| | | | | | | | | | | | PHPBB3-13778
* | | Merge branch '3.1.x'Andreas Fischer2015-04-271-1/+1
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
| * | Merge pull request #3555 from akoeplinger/ticket/12101Andreas Fischer2015-04-271-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver * akoeplinger/ticket/12101: [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
| | * [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserverAlexander Köplinger2015-04-261-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | The code was added as a workaround for bugs in very old versions of IIS, dating back to 2002: see commit 849d76697444f4e3523845f8c96569ccde57d868. Newer IIS versions handle the 'Location' header just fine, so we can avoid the unnecessary HTML page for redirects. Given that it seems to work fine since IIS 6.0 (on WinServer 2003), I don't think it's worth adding a special check for earlier versions as they are no longer supported by MS as well. PHPBB3-12101
* | Merge pull request #3524 from marc1706/ticket/8672Tristan Darricau2015-04-2724-57/+220
|\ \ | | | | | | | | | [ticket/8672] Add class for retrieving imagesize without download
| * | [ticket/8672] Update hash of lock fileMarc Alexander2015-04-241-1/+1
| | | | | | | | | | | | PHPBB3-8672
| * | [ticket/8672] User $user->lang() instead of sprintfMarc Alexander2015-04-242-3/+3
| | | | | | | | | | | | PHPBB3-8672
| * | [ticket/8672] Remove unnecessary lines from clean-vendor-dirMarc Alexander2015-04-241-9/+0
| | | | | | | | | | | | | | | | | | | | | The new version of fastImageSize already makes sure that these files and/or folders do not exist. PHPBB3-8672
| * | [ticket/8672] Update fastImageSize to 1.0.2Marc Alexander2015-04-241-5/+5
| | | | | | | | | | | | PHPBB3-8672
| * | [ticket/8672] Add fastImageSize to clean-vendor-dir in build.xmlMarc Alexander2015-04-241-0/+9
| | | | | | | | | | | | PHPBB3-8672
| * | [ticket/8672] Update fastImageSize to 1.0.1Marc Alexander2015-04-241-5/+5
| | | | | | | | | | | | PHPBB3-8672
| * | [ticket/8672] Remove outdated imagesize classMarc Alexander2015-04-241-549/+0
| | | | | | | | | | | | PHPBB3-8672
| * | [ticket/8672] Use fastImageSize in classesMarc Alexander2015-04-2410-18/+18
| | | | | | | | | | | | PHPBB3-8672
| * | [ticket/8672] Add fast-image-size library to composer.jsonMarc Alexander2015-04-242-0/+52
| | | | | | | | | | | | PHPBB3-8672
| * | [ticket/8672] Updated the text_formatter.s9e serviceJoshyPHP2015-04-242-9/+9
| | | | | | | | | | | | PHPBB3-8672
| * | [ticket/8672] Add class for retrieving imagesize without downloadMarc Alexander2015-04-2420-46/+706
| | | | | | | | | | | | | | | | | | | | | | | | getimagesize() always downloads the complete file before checking the actual image dimensions. This class will be able to do the same without having to download possibly large files. PHPBB3-8672
* | | Merge pull request #3548 from s9e/ticket/12745Andreas Fischer2015-04-263-21/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12745] Allow Unicode characters from the SMP to be used in text * s9e/ticket/12745: [ticket/12745] Added HTML entity test [ticket/12745] Added support for Unicode characters outside BMP [ticket/12745] Updated s9e\TextFormatter
| * | | [ticket/12745] Added HTML entity testJoshyPHP2015-04-251-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/phpbb/phpbb/pull/3548#issuecomment-96219167 PHPBB3-12745
| * | | [ticket/12745] Added support for Unicode characters outside BMPJoshyPHP2015-04-252-17/+10
| | | | | | | | | | | | | | | | PHPBB3-12745
| * | | [ticket/12745] Updated s9e\TextFormatterJoshyPHP2015-04-251-4/+4
| |/ / | | | | | | | | | PHPBB3-12745
* | | 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.
| | * | [ticket/13755] Ignore dots in path when determining file extension.Cesar G2015-04-102-0/+4
| | | | | | | | | | | | | | | | PHPBB3-13755
* | | | Merge branch '3.1.x'Andreas Fischer2015-04-250-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * 3.1.x:
| * | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-250-0/+0
| |\ \ \ | | | | | | | | | | | | | | | * prep-release-3.1.4:
| | * \ \ Merge pull request #3550 from bantu/ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. * bantu/ticket/13765-3.1.4: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
* | | \ \ \ Merge branch '3.1.x'Andreas Fischer2015-04-251-2/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | * 3.1.x: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
| * | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-04-250-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | * 3.0.x:
| | * \ \ \ Merge pull request #3549 from bantu/ticket/13765Andreas Fischer2015-04-252-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. * bantu/ticket/13765: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
| * | \ \ \ \ Merge pull request #3550 from bantu/ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. * bantu/ticket/13765-3.1.4: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
| | * | | | | Merge branch 'ticket/13765' into ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| | |\ \ \ \ \ | | | | |/ / / | | | |/| / / | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13765: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. Conflicts: phpBB/includes/functions.php phpBB/includes/startup.php
| | | * | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.Joas Schilling2015-04-252-2/+2
| | | |/ / | | | | | | | | | | | | | | | PHPBB3-13765
* | | | | Merge pull request #3541 from s9e/ticket/13767Andreas Fischer2015-04-221-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13767] Remove vendor/s9e/text-formatter/.git during build * s9e/ticket/13767: [ticket/13767] Remove vendor/s9e/text-formatter/.git during build
| * | | | | [ticket/13767] Remove vendor/s9e/text-formatter/.git during buildJoshyPHP2015-04-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13767
* | | | | | Merge pull request #3547 from s9e/ticket/13774Andreas Fischer2015-04-221-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13774] Update s9e\TextFormatter * s9e/ticket/13774: [ticket/13774] Updated s9e\TextFormatter
| * | | | | | [ticket/13774] Updated s9e\TextFormatterJoshyPHP2015-04-221-4/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-13774
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-221-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * 3.1.x: [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
| * | | | | Merge pull request #3546 from brunoais/ticket/13772Andreas Fischer2015-04-221-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct() * brunoais/ticket/13772: [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
| | * | | | | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()brunoais2015-04-211-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-13772
* | | | | | Merge pull request #3544 from Nicofuma/ticket/13768Andreas Fischer2015-04-224-148/+188
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13768] Update to symfony 2.8.*@dev * Nicofuma/ticket/13768: [ticket/13768] Fix deprecations [ticket/13768] Update to symfony 2.8.*@dev
| * | | | | [ticket/13768] Fix deprecationsTristan Darricau2015-04-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13768
| * | | | | [ticket/13768] Update to symfony 2.8.*@devTristan Darricau2015-04-192-145/+185
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-13768
* | | | | 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_st...
| * | | | | [ticket/13766] Add style_parent_id in textformater's data_access::get_styles()MateBartus2015-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13766
* | | | | | Merge pull request #3446 from MateBartus/ticket/13654Tristan Darricau2015-04-1626-343/+1208
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | [ticket/13654] Moving reporting into controller
| * | | | | [ticket/13654] Moving reporting into controllerMateBartus2015-04-1626-343/+1208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving report.php's content into different services and controllers to better comply with the MVC model. Also implementing: * Replacement for reasons_display() * Adding assign_meta_refresh_var() to \controller\helper * Adding separate routes for easy configuration * Updating unit tests to expect to correct results * Add BC tests PHPBB3-13654