aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-12-261-1/+1
|\
| * Merge pull request #4100 from marc1706/ticket/14303Marc Alexander2015-12-261-1/+1
| |\ | | | | | | | | | [ticket/14303] Use UTF8 quotes in app.php lang file
| | * [ticket/14303] Use UTF8 quotes in app.php lang filephpBB España2015-12-261-1/+1
| |/ | | | | | | PHPBB3-14303
* | Merge pull request #4099 from marc1706/ticket/14371Marc Alexander2015-12-241-1/+1
|\ \ | | | | | | | | | [ticket/14371] Small fix for the quick links alignment
| * | [ticket/14371] Small fix for the quick links alignmentMelvin García2015-12-241-1/+1
|/ / | | | | | | PHPBB3-14371
* | Merge pull request #4094 from Nicofuma/ticket/14377Marc Alexander2015-12-232-0/+41
|\ \ | | | | | | | | | [ticket/14377] Allow extensions to register compiler pass
| * | [ticket/14377] Handle new $classname() in the snifferTristan Darricau2015-12-231-0/+5
| | | | | | | | | | | | PHPBB3-14377
| * | [ticket/14377] Allow extensions to register compiler passTristan Darricau2015-12-221-0/+36
| | | | | | | | | | | | PHPBB3-14377
* | | Merge branch '3.1.x'Marc Alexander2015-12-231-4/+4
|\ \ \ | | |/ | |/| | | | | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_im.html
| * | Merge pull request #4084 from exussum12/ticket/14046Marc Alexander2015-12-232-10/+9
| |\ \ | | | | | | | | | | | | [ticket/14046] Jabber message incorrect
| | * | [ticket/14046] Jabber message incorrectScott Dutton2015-12-162-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When making a Jabber message, the page says the message has been sent when loading the page for the first time, This message should only be shown after the message has actually been sent PHPBB3-14046
* | | | Merge pull request #4096 from CHItA/ticket/14380Marc Alexander2015-12-222-2/+2
|\ \ \ \ | | | | | | | | | | [ticket/14380] Maintain consistent template var paths in 3.2 installer
| * | | | [ticket/14380] Maintain consistent template var paths in 3.2 installerMate Bartus2015-12-222-2/+2
|/ / / / | | | | | | | | | | | | PHPBB3-14380
* | | | Merge pull request #4095 from marc1706/ticket/14378Máté Bartus2015-12-224-10/+10
|\ \ \ \ | | | | | | | | | | [ticket/14378] Use consistent template variable paths
| * | | | [ticket/14378] Use consistent template variable pathsMarc Alexander2015-12-224-10/+10
|/ / / / | | | | | | | | | | | | PHPBB3-14378
* | | | Merge branch '3.1.x'Marc Alexander2015-12-225-5/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | Conflicts: phpBB/adm/style/installer_footer.html
| * | Merge pull request #4093 from VSEphpbb/ticket/14374Marc Alexander2015-12-225-5/+5
| |\ \ | | | | | | | | | | | | [ticket/14374] Update dynamic fallback jquery CDN script tag
| | * | [ticket/14374] Update dynamic fallback jquery CDN script tagMatt Friedman2015-12-225-5/+5
| |/ / | | | | | | | | | PHPBB3-14374
* | | Merge pull request #4091 from marc1706/ticket/14373Tristan Darricau2015-12-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14373] Do not pass arrays to strpos() * marc1706/ticket/14373: [ticket/14373] Do not pass arrays to strpos()
| * | | [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