aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Joas Schilling2015-12-191-0/+31
|\ | | | | | | | | Conflicts: build/build.xml
| * Merge branch 'prep-release-3.1.7' into 3.1.xJoas Schilling2015-12-191-0/+31
| |\ | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.1.7] Add migration to update the versionJoas Schilling2015-12-191-0/+31
| | |
| | * [prep-release-3.1.7] Increase version to 3.1.7Joas Schilling2015-12-192-2/+2
| | |
* | | [ticket/14359] Fix console.command.reparser.reparse service definitionTristan Darricau2015-12-141-1/+1
| | | | | | | | | | | | PHPBB3-14359
* | | Merge pull request #4080 from Nicofuma/ticket/14358Máté Bartus2015-12-141-0/+1
|\ \ \ | | | | | | | | [ticket/14358] Includes the composer autoloader in create_schema_files.php
| * | | [ticket/14358] Includes the composer autoloader in create_schema_files.phpTristan Darricau2015-12-141-0/+1
| | | | | | | | | | | | | | | | PHPBB3-14358
* | | | Merge branch '3.1.x'Marc Alexander2015-12-131-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #4078 from VSEphpbb/ticket/14353Marc Alexander2015-12-131-2/+2
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14353] Complete [list] bbcode documentation/examples
| | * | | [ticket/14353] Complete [list] bbcode documentation/examplesMatt Friedman2015-12-111-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14353
* | | | | Merge branch '3.1.x'Joas Schilling2015-12-122-0/+139
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | | [3.1.x] Update version to 3.1.8-devJoas Schilling2015-12-122-2/+2
| | |_|/ | |/| |
| * | | [prep-release-3.1.7] Add changelog for 3.1.7-RC1Joas Schilling2015-12-121-0/+108
| | | |
| * | | [prep-release-3.1.7] Add migration for 3.1.7-RC1Joas Schilling2015-12-121-0/+32
| | | |
| * | | [prep-release-3.1.7] Update version to 3.1.7-RC1Joas Schilling2015-12-125-7/+7
| | | |
* | | | Merge pull request #4074 from marc1706/ticket/14349Máté Bartus2015-12-094-2/+9
|\ \ \ \ | |_|_|/ |/| | | [ticket/14349] Improve error messages and remove output of suppressed messages
| * | | [ticket/14349] Suppress output due to duplicate definition in installerMarc Alexander2015-12-082-2/+3
| | | | | | | | | | | | | | | | PHPBB3-14349
| * | | [ticket/14349] Add cli error message on missing or invalid dataMarc Alexander2015-12-081-0/+1
| | | | | | | | | | | | | | | | PHPBB3-14349
| * | | [ticket/14349] Do output suppressed errorsMarc Alexander2015-12-081-0/+5
| | | | | | | | | | | | | | | | PHPBB3-14349
* | | | [ticket/14350] Remove duplicate semi-colon in functions_userMarc Alexander2015-12-081-1/+1
|/ / / | | | | | | | | | PHPBB3-14350
* | | Merge branch '3.1.x'Tristan Darricau2015-12-081-4/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14271] Properly use try_files in nginx sample config [ticket/14271] Improve try_files and use split path info [ticket/14271] Update sample config
| * | Merge pull request #4018 from marc1706/ticket/14271Tristan Darricau2015-12-081-4/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14271] Update sample config * marc1706/ticket/14271: [ticket/14271] Properly use try_files in nginx sample config [ticket/14271] Improve try_files and use split path info [ticket/14271] Update sample config
| | * | [ticket/14271] Properly use try_files in nginx sample configMarc Alexander2015-11-101-6/+4
| | | | | | | | | | | | | | | | PHPBB3-14271
| | * | [ticket/14271] Improve try_files and use split path infoMarc Alexander2015-11-091-2/+4
| | | | | | | | | | | | | | | | PHPBB3-14271
| | * | [ticket/14271] Update sample configMarc Alexander2015-11-051-3/+12
| | | | | | | | | | | | | | | | PHPBB3-14271
* | | | Merge branch '3.1.x'Tristan Darricau2015-12-081-1/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14213] Add pending to core.group_add_user_after [ticket/14213] Mv event group_add_user_after after cache cleaning [ticket/14213] Fix version number [ticket/14213] Adding missing reference to event dispatcher [ticket/14213] Adding event after users have been added to a group
| * | | Merge pull request #4071 from marc1706/ticket/14213Tristan Darricau2015-12-081-1/+21
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14213] Adding event after users have been added to a group * marc1706/ticket/14213: [ticket/14213] Add pending to core.group_add_user_after [ticket/14213] Mv event group_add_user_after after cache cleaning [ticket/14213] Fix version number [ticket/14213] Adding missing reference to event dispatcher [ticket/14213] Adding event after users have been added to a group
| | * | [ticket/14213] Add pending to core.group_add_user_afterMarc Alexander2015-12-081-1/+8
| | | | | | | | | | | | | | | | PHPBB3-14213
| | * | [ticket/14213] Mv event group_add_user_after after cache cleaningWardormeur2015-12-071-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | In order to match with the rest of the event and to have appropriate info state PHPBB3-14213
| | * | [ticket/14213] Fix version numberWardormeur2015-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | for core.group_add_user_after event PHPBB3-14213
| | * | [ticket/14213] Adding missing reference to event dispatcherWardormeur2015-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Required to dispatch event, wasn't included into global PHPBB3-14213
| | * | [ticket/14213] Adding event after users have been added to a groupWardormeur2015-12-071-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Allow mapping with others CMS by exposing user configuration & changes PHPBB3-14213
* | | | Merge pull request #4072 from marc1706/ticket/14344Tristan Darricau2015-12-082-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14344] Improve output of HTML errors trigged during install * marc1706/ticket/14344: [ticket/14344] Improve output of HTML errors trigged during install
| * | | | [ticket/14344] Improve output of HTML errors trigged during installMarc Alexander2015-12-072-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-14344
* | | | | Merge pull request #4073 from CHItA/ticket/14348Marc Alexander2015-12-081-0/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14348] Add install/index.html
| * | | | | [ticket/14348] Add install/index.htmlMate Bartus2015-12-081-0/+11
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-14348
* | | | | [ticket/14247] Use quotes around @ and % strings in YAMLMatt Friedman2015-12-0752-1120/+1120
|/ / / / | | | | | | | | | | | | PHPBB3-14247
* | | | Merge branch '3.1.x'Tristan Darricau2015-12-073-45/+39
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14261] Fix tests by removing old code. [ticket/14261] Move the update of session informations to page_footer()
| * | | Merge pull request #4008 from Zoddo/ticket/14261Tristan Darricau2015-12-073-45/+39
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14261] Move the update of session informations to page_footer() * Zoddo/ticket/14261: [ticket/14261] Fix tests by removing old code. [ticket/14261] Move the update of session informations to page_footer()
| | * | | [ticket/14261] Fix tests by removing old code.Zoddo2015-10-281-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will obselete GH-4007 PHPBB3-14261 PHPBB3-13202
| | * | | [ticket/14261] Move the update of session informations to page_footer()Zoddo2015-10-273-45/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the unique way to disable the update of session_page is to pass "false" to the parameter of session_begin(). This method is directly called in app.php, so pages served from the routing system can't disable the update of session informations. By moving the update to page_footer, we can allow controllers to tell to the session manager that we don't want to update the session infos. PHPBB3-14261
* | | | | Merge branch '3.1.x'Tristan Darricau2015-12-071-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14346] Do not turn version red if update status is unknown
| * | | | Merge pull request #4069 from marc1706/ticket/14346Tristan Darricau2015-12-071-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14346] Do not turn version red if update status is unknown * marc1706/ticket/14346: [ticket/14346] Do not turn version red if update status is unknown
| | * | | | [ticket/14346] Do not turn version red if update status is unknownMarc Alexander2015-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14346
| * | | | | Merge pull request #4063 from marc1706/ticket/14339Tristan Darricau2015-12-073-3/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14339] Properly state PHP version support * marc1706/ticket/14339: [ticket/14339] Properly state PHP version support
* | | | | | [ticket/14339] Specify that PHP 7.0 is supported instead of "prior versions"Marc Alexander2015-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14339
* | | | | | Merge branch 'ticket/14339' into ticket/14339-masterMarc Alexander2015-12-073-3/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/composer.json phpBB/docs/INSTALL.html phpBB/docs/README.html
| * | | | | [ticket/14339] Properly state PHP version supportMarc Alexander2015-12-053-3/+3
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-14339
* | | | | Merge branch '3.1.x'Tristan Darricau2015-12-071-0/+16
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * 3.1.x: [ticket/14343] Add event when locking/unlocking posts/topics
| * | | | [ticket/14343] Add event when locking/unlocking posts/topicskasimi2015-12-061-0/+16
| |/ / / | | | | | | | | | | | | PHPBB3-14343