| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '3.1.x' | Marc Alexander | 2015-12-23 | 1 | -4/+4 |
| |\ | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_im.html | ||||
| | * | Merge pull request #4084 from exussum12/ticket/14046 | Marc Alexander | 2015-12-23 | 2 | -10/+9 |
| | |\ | | | | | | | | | | [ticket/14046] Jabber message incorrect | ||||
| | | * | [ticket/14046] Jabber message incorrect | Scott Dutton | 2015-12-16 | 2 | -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/14380 | Marc Alexander | 2015-12-22 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | [ticket/14380] Maintain consistent template var paths in 3.2 installer | ||||
| | * | | | [ticket/14380] Maintain consistent template var paths in 3.2 installer | Mate Bartus | 2015-12-22 | 2 | -2/+2 |
| |/ / / | | | | | | | | | | PHPBB3-14380 | ||||
| * | | | Merge pull request #4095 from marc1706/ticket/14378 | Máté Bartus | 2015-12-22 | 4 | -10/+10 |
| |\ \ \ | | | | | | | | | [ticket/14378] Use consistent template variable paths | ||||
| | * | | | [ticket/14378] Use consistent template variable paths | Marc Alexander | 2015-12-22 | 4 | -10/+10 |
| |/ / / | | | | | | | | | | PHPBB3-14378 | ||||
| * | | | Merge branch '3.1.x' | Marc Alexander | 2015-12-22 | 5 | -5/+5 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: phpBB/adm/style/installer_footer.html | ||||
| | * | | Merge pull request #4093 from VSEphpbb/ticket/14374 | Marc Alexander | 2015-12-22 | 5 | -5/+5 |
| | |\ \ | | | | | | | | | | | | | [ticket/14374] Update dynamic fallback jquery CDN script tag | ||||
| | | * | | [ticket/14374] Update dynamic fallback jquery CDN script tag | Matt Friedman | 2015-12-22 | 5 | -5/+5 |
| | |/ / | | | | | | | | | | PHPBB3-14374 | ||||
| * | | | Merge pull request #4091 from marc1706/ticket/14373 | Tristan Darricau | 2015-12-22 | 1 | -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 Alexander | 2015-12-20 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | PHPBB3-14373 | ||||
| * | | | Merge pull request #4076 from Nicofuma/ticket/14177 | Marc Alexander | 2015-12-20 | 3 | -6/+130 |
| |\ \ \ | | | | | | | | | | | | | [ticket/14177] Uses Symfony's Debug ErrorHandler in development environment | ||||
| | * | | | [ticket/14177] CS | Tristan Darricau | 2015-12-15 | 2 | -11/+20 |
| | | | | | | | | | | | | | | | | | PHPBB3-14177 | ||||
| | * | | | [ticket/14177] Uses Symfony's Debug ErrorHandler in development environment | Tristan Darricau | 2015-12-11 | 3 | -6/+121 |
| | | | | | | | | | | | | | | | | | PHPBB3-14177 | ||||
| * | | | | Merge pull request #4087 from VSEphpbb/ticket/14368 | Marc Alexander | 2015-12-20 | 1 | -1/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/14368] Fix color of post editor input boxes | ||||
| | * | | | | [ticket/14368] Fix color of post editor input boxes | Matt Friedman | 2015-12-19 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-14368 PHPBB3-14368 | ||||
| * | | | | | Merge pull request #4083 from RMcGirr83/ticket_14362 | Tristan Darricau | 2015-12-19 | 1 | -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 file | Richard McGirr | 2015-12-16 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14362 | ||||
| * | | | | | | [release-3.2.0-a2] Update version to 3.2.0-a3 | Tristan Darricau | 2015-12-19 | 3 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'prep-release-3.2.0-a2' | Tristan Darricau | 2015-12-19 | 7 | -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-a2 | Tristan Darricau | 2015-12-19 | 1 | -0/+36 |
| | | | | | | | | |||||
| | * | | | | | | [prep-release-3.2.0-a2] Add migration for 3.2.0-a2 | Tristan Darricau | 2015-12-19 | 1 | -0/+38 |
| | | | | | | | | |||||
| | * | | | | | | [prep-release-3.2.0-a2] Update version to 3.2.0-a2 | Tristan Darricau | 2015-12-19 | 5 | -6/+6 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-12-19 | 2 | -1/+32 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | Conflicts: build/build.xml | ||||
| | * | | | | Merge branch 'prep-release-3.1.7' into 3.1.x | Joas Schilling | 2015-12-19 | 2 | -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 version | Joas Schilling | 2015-12-19 | 1 | -0/+31 |
| | | | | | | | |||||
| | | * | | | | [prep-release-3.1.7] Increase version to 3.1.7 | Joas Schilling | 2015-12-19 | 3 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4081 from Nicofuma/ticket/14359 | Máté Bartus | 2015-12-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | [ticket/14359] Fix console.command.reparser.reparse service definition | ||||
| | * | | | | | | [ticket/14359] Fix console.command.reparser.reparse service definition | Tristan Darricau | 2015-12-14 | 1 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | PHPBB3-14359 | ||||
| * | | | | | | Merge pull request #4080 from Nicofuma/ticket/14358 | Máté Bartus | 2015-12-14 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | [ticket/14358] Includes the composer autoloader in create_schema_files.php | ||||
| | * | | | | | | [ticket/14358] Includes the composer autoloader in create_schema_files.php | Tristan Darricau | 2015-12-14 | 1 | -0/+1 |
| | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | PHPBB3-14358 | ||||
| * | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-12-13 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | | Merge pull request #4078 from VSEphpbb/ticket/14353 | Marc Alexander | 2015-12-13 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/14353] Complete [list] bbcode documentation/examples | ||||
| | | * | | | | | [ticket/14353] Complete [list] bbcode documentation/examples | Matt Friedman | 2015-12-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14353 | ||||
| * | | | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-12-12 | 2 | -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-dev | Joas Schilling | 2015-12-12 | 3 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'prep-release-3.1.7' into 3.1.x | Joas Schilling | 2015-12-12 | 8 | -8/+148 |
| | |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | | [prep-release-3.1.7] Add changelog for 3.1.7-RC1 | Joas Schilling | 2015-12-12 | 1 | -0/+108 |
| | | | | | | | | |||||
| | | * | | | | | [prep-release-3.1.7] Add migration for 3.1.7-RC1 | Joas Schilling | 2015-12-12 | 1 | -0/+32 |
| | | | | | | | | |||||
| | | * | | | | | [prep-release-3.1.7] Update version to 3.1.7-RC1 | Joas Schilling | 2015-12-12 | 6 | -8/+8 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #4074 from marc1706/ticket/14349 | Máté Bartus | 2015-12-09 | 4 | -2/+9 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | [ticket/14349] Improve error messages and remove output of suppressed messages | ||||
| | * | | | | | [ticket/14349] Suppress output due to duplicate definition in installer | Marc Alexander | 2015-12-08 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14349 | ||||
| | * | | | | | [ticket/14349] Add cli error message on missing or invalid data | Marc Alexander | 2015-12-08 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14349 | ||||
| | * | | | | | [ticket/14349] Do output suppressed errors | Marc Alexander | 2015-12-08 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14349 | ||||
| * | | | | | | Merge pull request #4075 from marc1706/ticket/14350 | Tristan Darricau | 2015-12-08 | 1 | -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_user | Marc Alexander | 2015-12-08 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | PHPBB3-14350 | ||||
| * | | | | | Merge branch '3.1.x' | Tristan Darricau | 2015-12-08 | 1 | -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/14271 | Tristan Darricau | 2015-12-08 | 1 | -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 config | Marc Alexander | 2015-11-10 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14271 | ||||
