aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 08:52:34 +0000