aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 #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
* | | Merge pull request #3487 from MateBartus/ticket/13697Tristan Darricau2015-04-1682-658/+1860
|\ \ \ | | | | | | | | | | | | [ticket/13697] Moving filesystem related functions to filesystem service
| * | | [ticket/13697] Moving filesystem related functions to filesystem serviceMateBartus2015-04-1682-658/+1860
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moving filesystem service to \phpbb\filesystem namespace * Wraping Symfony's Filesystem component * Moving filesystem related functions from includes/functions.php into \phpbb\filesystem\filesystem Functions moved (and deprecated): - phpbb_chmod - phpbb_is_writable - phpbb_is_absolute - phpbb_own_realpath - phpbb_realpath * Adding interface for filesystem service PHPBB3-13697
* | | | Merge branch '3.1.x'Andreas Fischer2015-04-161-1/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| * 3.1.x: [ticket/13763] Fix typo in extension lang file
| * | Merge pull request #3537 from RMcGirr83/ticket/13763Andreas Fischer2015-04-161-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13763] Fix typo in extension lang file * RMcGirr83/ticket/13763: [ticket/13763] Fix typo in extension lang file
| | * | [ticket/13763] Fix typo in extension lang fileRichard McGirr2015-04-151-1/+1
| |/ / | | | | | | | | | PHPBB3-13763
* | | 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] Fix resize after upload with plupload
| | * | [ticket/13756] Add test for generate_resize_string()Oliver Schramm2015-04-121-0/+53
| | | | | | | | | | | | | | | | PHPBB3-13756
| | * | [ticket/13756] Fix resize after upload with pluploadOliver Schramm2015-04-111-2/+2
| |/ / | | | | | | | | | PHPBB3-13756
* | | Merge branch '3.1.x'Joas Schilling2015-04-103-2/+148
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | [3.1.x] Update development version to 3.1.5-devJoas Schilling2015-04-103-3/+3
| | |
| * | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-04-108-9/+155
| |\ \
| | * | [prep-release-3.1.4] Add changelog for 3.1.4-RC1Joas Schilling2015-04-091-1/+116
| | | |
| | * | [prep-release-3.1.4] Add migration for 3.1.4-RC1Joas Schilling2015-04-091-0/+31
| | | |
| | * | Update version to 3.1.4-RC1Joas Schilling2015-04-096-8/+8
| |/ /
* | | Merge branch '3.1.x'Oliver Schramm2015-04-061-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3525 from marc1706/ticket/13749Oliver Schramm2015-04-061-1/+1
| |\ \ | | | | | | | | | | | | [ticket/13749] Add missing slash to base uri in helper route tests
| | * | [ticket/13749] Add missing slash to base uri in helper route testsMarc Alexander2015-04-061-1/+1
| |/ / | | | | | | | | | PHPBB3-13749
* | | Merge branch '3.1.x'Joas Schilling2015-04-063-1/+55
|\ \ \ | |/ /
| * | Merge pull request #3392 from marc1706/ticket/13493Joas Schilling2015-04-063-1/+55
| |\ \ | | | | | | | | | | | | [ticket/13493] Append page name to base url if it doesn't contain it
| | * | [ticket/13493] Append page name to base url if it doesn't contain itMarc Alexander2015-02-113-1/+55
| | | | | | | | | | | | | | | | PHPBB3-13493
* | | | Merge branch '3.1.x'Joas Schilling2015-04-062-1/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html
| * | | Merge pull request #3492 from RMcGirr83/ticket/13710Joas Schilling2015-04-063-1/+30
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13710] Allow template events near smilies display
| | * | | [ticket/13710] Allow template events near smilies displayRMcGirr832015-03-193-1/+30
| | | | | | | | | | | | | | | | | | | | PHPBB3-13710
* | | | | Merge branch '3.1.x'Joas Schilling2015-04-062-0/+16
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3488 from Crizz0/ticket/13701Joas Schilling2015-04-062-0/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13701] Adds two new events to posting_pm_layout.html Conflicts: phpBB/docs/events.md