aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 #3359 from marc1706/ticket/13568Nicofuma2015-03-292-5/+10
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3359
* | | | | [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()
| * | | | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()brunoais2015-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13772
* | | | | [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-1624-340/+1161
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | [ticket/13654] Moving reporting into controller
| * | | | | [ticket/13654] Moving reporting into controllerMateBartus2015-04-1624-340/+1161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1646-579/+1651
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13697] Moving filesystem related functions to filesystem service
| * | | | | | [ticket/13697] Moving filesystem related functions to filesystem serviceMateBartus2015-04-1646-579/+1651
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | [ticket/13763] Fix typo in extension lang fileRichard McGirr2015-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13763
* | | | | | Merge branch '3.1.x'Dhruv2015-04-141-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [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-102-2/+2
| | |/ / / | |/| | |
| * | | | [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-095-7/+7
| | | | |
* | | | | Merge branch '3.1.x'Joas Schilling2015-04-061-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3392 from marc1706/ticket/13493Joas Schilling2015-04-061-0/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [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-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | [ticket/13701] Adds two new events to posting_pm_layout.htmlCrizzo2015-03-132-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These events wrap the includes of posting_pm_header.html to add some content before and after it. PHPBB3-13701
* | | | | | | | Merge branch '3.1.x'Joas Schilling2015-04-062-1/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_poll_body.html
| * | | | | | | Merge pull request #3517 from Wolfsblvt/ticket/13739Joas Schilling2015-04-063-1/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13739] Add template core event posting_poll_body_options_after
| | * | | | | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing order of if statement and event PHPBB3-13739
| | * | | | | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing if else construct in prosilver so that the event is placed correctly PHPBB3-13739
| | * | | | | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-033-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template event added for the poll options while posting a topic so that you may add additional options for polls. PHPBB3-13739
* | | | | | | | | Merge branch '3.1.x'Tristan Darricau2015-04-061-6/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3458 from nickvergessen/ticket/8494Tristan Darricau2015-04-061-6/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8494] Ignore errors from the database schema preparation
| | * | | | | | | | [ticket/8494] Ignore errors from the database schema preparationJoas Schilling2015-03-011-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows installing phpBB twice in the same database with a different prefix PHPBB3-8494
* | | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-04-061-1/+23
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3437 from marc1706/ticket/12368Joas Schilling2015-04-061-1/+23
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12368] Correctly check if avatars migration is installed
| | * | | | | | | | | [ticket/12368] Fix comment in docblockMarc Alexander2015-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12368
| | * | | | | | | | | [ticket/12368] Correctly check if avatars migration is installedMarc Alexander2015-02-241-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to set the avatar type to string value to check if new avatar types are supported. PHPBB3-12368
* | | | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-04-061-0/+25
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #3409 from Senky/ticket/11424Joas Schilling2015-04-061-0/+25
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11424] Quick-Mod Tools race condition results in NO_MODE
| | * | | | | | | | | | [ticket/11424] Add space between control flow keywords and parenthesisJakub Senko2015-02-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11424
| | * | | | | | | | | | [ticket/11424] Handle race condition properly for Quick-Mod ToolsJakub Senko2015-02-161-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11424
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 07:40:21 +0000