aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2016-01-072-0/+32
|\ | | | | | | | | | | Conflicts: phpBB/styles/prosilver/template/viewtopic_body.html phpBB/styles/subsilver2/template/viewtopic_body.html
| * Merge pull request #4079 from rxu/ticket/14356Marc Alexander2016-01-073-2/+38
| |\ | | | | | | | | | [ticket/14356] Add template events to viewtopic around back2top link
| | * [ticket/14356] Add template events to viewtopic around back2top linkrxu2015-12-173-2/+38
| | | | | | | | | | | | PHPBB3-14356
* | | Merge pull request #4000 from Elsensee/ticket/14250Marc Alexander2016-01-077-884/+662
|\ \ \ | | | | | | | | | | | | [ticket/14250] Review/bump dependencies
| * | | [ticket/14250] Added symfony/debug as requirementOliver Schramm2016-01-062-2/+3
| | | | | | | | | | | | | | | | PHPBB3-14250
| * | | [ticket/14250] Update symfony dev-requirements to stableOliver Schramm2016-01-052-36/+27
| | | | | | | | | | | | | | | | PHPBB3-14250
| * | | [ticket/14250] Replace abandoned guzzle packagesOliver Schramm2016-01-042-162/+56
| | | | | | | | | | | | | | | | PHPBB3-14250
| * | | [ticket/14250] Track version numbers instead of commit idOliver Schramm2016-01-042-10/+9
| | | | | | | | | | | | | | | | PHPBB3-14250
| * | | [ticket/14250] Fix composer.jsonOliver Schramm2016-01-042-725/+342
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Symfony dependencies that aren't required by phpBB itself but by one of its dependencies are now forced to be 2.8 LTS again. PHPBB3-14250
| * | | [ticket/14250] Change token_storage class to fit changed interfaceOliver Schramm2016-01-045-15/+296
| | | | | | | | | | | | | | | | PHPBB3-14250
| * | | [ticket/14250] Review/bump dependenciesOliver Schramm2016-01-041-16/+11
| | | | | | | | | | | | | | | | PHPBB3-14250
* | | | Merge branch '3.1.x'Marc Alexander2016-01-061-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: phpBB/includes/mcp/mcp_main.php
| * | | Merge pull request #4109 from marc1706/ticket/14343Marc Alexander2016-01-061-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14343] Added missing $phpbb_dispatcher
| | * | | [ticket/14343] Added missing $phpbb_dispatcherkasimi2016-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14343
* | | | | Merge branch '3.1.x'Marc Alexander2016-01-065-18/+34
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4105 from marc1706/ticket/14387Marc Alexander2016-01-065-18/+34
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14387] Allow extending avatars by extensions in ACP
| | * | | | [ticket/14387] Extend avatar-driver by extension in ACP not possiblejaviexin2016-01-023-30/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create two driver methods to provide the driver config name and the driver ACP template name, and use them directly when required. Default driver config name and template name are the same as now. But new drivers are able to override the config name and template name with their own, including @vendor_extension. Simplified manager interface by reducing unneeded methods. PHPBB3-14387
| | * | | | [ticket/14387] Extend avatar-driver by extension in ACP not possiblejaviexin2016-01-025-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create two driver methods to provide the driver config name and the driver ACP template name, and use them within the manager method. Default driver config name and template name are the same as now. But new drivers are able to override the config name and template name with their own, including @vendor_extension. PHPBB3-14387
| | * | | | [ticket/14387] Extend avatar-driver by extension in ACP not possiblejaviexin2016-01-023-1/+16
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a driver method to provide the driver config name, and use it within the manager method. Default driver config name is the same as now. But new drivers are able to override the config name with their own. PHPBB3-14387
| * | | | [ticket/14386] Use of sys_get_temp_dir()Erwan Nader2016-01-031-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-14386
* | | | [ticket/14386] Use of sys_get_temp_dir()Erwan Nader2016-01-061-2/+1
| |/ / |/| | | | | | | | PHPBB3-14386
* | | Merge branch '3.1.x'Marc Alexander2015-12-261-1/+1
|\ \ \ | |/ /
| * | [ticket/14303] Use UTF8 quotes in app.php lang filephpBB España2015-12-261-1/+1
| | | | | | | | | | | | PHPBB3-14303
* | | [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-231-0/+36
|\ \ \ | | | | | | | | | | | | [ticket/14377] Allow extensions to register compiler pass
| * | | [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
* | | | | [ticket/14380] Maintain consistent template var paths in 3.2 installerMate Bartus2015-12-222-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14380
* | | | | [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
| * | | [ticket/14374] Update dynamic fallback jquery CDN script tagMatt Friedman2015-12-225-5/+5
| | | | | | | | | | | | | | | | PHPBB3-14374
* | | | [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-192-2/+2
| | | | | | |
* | | | | | | [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-194-5/+5
| | | | | | |
* | | | | | | 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