aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14373] Do not pass arrays to strpos()Marc Alexander2015-12-201-1/+1
| | | | PHPBB3-14373
* Merge pull request #4076 from Nicofuma/ticket/14177Marc Alexander2015-12-203-6/+130
|\ | | | | | | [ticket/14177] Uses Symfony's Debug ErrorHandler in development environment
| * [ticket/14177] CSTristan Darricau2015-12-152-11/+20
| | | | | | | | PHPBB3-14177
| * [ticket/14177] Uses Symfony's Debug ErrorHandler in development environmentTristan Darricau2015-12-113-6/+121
| | | | | | | | PHPBB3-14177
* | Merge pull request #4087 from VSEphpbb/ticket/14368Marc Alexander2015-12-201-1/+0
|\ \ | | | | | | | | | [ticket/14368] Fix color of post editor input boxes
| * | [ticket/14368] Fix color of post editor input boxesMatt Friedman2015-12-191-1/+0
| | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-14368 PHPBB3-14368
* | | Merge pull request #4083 from RMcGirr83/ticket_14362Tristan Darricau2015-12-191-0/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14362] Missing lang var in install file * RMcGirr83/ticket_14362: [ticket/14362] Missing lang var in install file
| * | | [ticket/14362] Missing lang var in install fileRichard McGirr2015-12-161-0/+24
| | | | | | | | | | | | | | | | PHPBB3-14362
* | | | [release-3.2.0-a2] Update version to 3.2.0-a3Tristan Darricau2015-12-193-3/+3
| | | |
* | | | Merge branch 'prep-release-3.2.0-a2'Tristan Darricau2015-12-197-6/+80
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.2.0-a2: [prep-release-3.2.0-a2] Add changelog for 3.2.0-a2 [prep-release-3.2.0-a2] Add migration for 3.2.0-a2 [prep-release-3.2.0-a2] Update version to 3.2.0-a2
| * | | | [prep-release-3.2.0-a2] Add changelog for 3.2.0-a2Tristan Darricau2015-12-191-0/+36
| | | | |
| * | | | [prep-release-3.2.0-a2] Add migration for 3.2.0-a2Tristan Darricau2015-12-191-0/+38
| | | | |
| * | | | [prep-release-3.2.0-a2] Update version to 3.2.0-a2Tristan Darricau2015-12-195-6/+6
|/ / / /
* | | | Merge branch '3.1.x'Joas Schilling2015-12-192-1/+32
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: build/build.xml
| * | | Merge branch 'prep-release-3.1.7' into 3.1.xJoas Schilling2015-12-192-2/+33
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-193-4/+4
| | | | |
* | | | | Merge pull request #4081 from Nicofuma/ticket/14359Máté Bartus2015-12-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ticket/14359] Fix console.command.reparser.reparse service definition
| * | | | | [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-123-3/+3
| | | | | |
| * | | | | Merge branch 'prep-release-3.1.7' into 3.1.xJoas Schilling2015-12-128-8/+148
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | [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-126-8/+8
| |/ / / /
* | | | | 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
* | | | | Merge pull request #4075 from marc1706/ticket/14350Tristan Darricau2015-12-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | [ticket/14350] Remove duplicate semi-colon in functions_user * marc1706/ticket/14350: [ticket/14350] Remove duplicate semi-colon in functions_user
| * | | | [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