aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4000 from Elsensee/ticket/14250Marc Alexander2016-01-073-15/+294
|\ | | | | | | [ticket/14250] Review/bump dependencies
| * [ticket/14250] Change token_storage class to fit changed interfaceOliver Schramm2016-01-043-15/+294
| | | | | | | | PHPBB3-14250
* | Merge branch '3.1.x'Marc Alexander2016-01-063-14/+32
|\ \
| * | [ticket/14387] Extend avatar-driver by extension in ACP not possiblejaviexin2016-01-021-26/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-023-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-061-2/+1
| |/ |/| | | | | PHPBB3-14386
* | 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
* | | [ticket/14378] Use consistent template variable pathsMarc Alexander2015-12-221-3/+3
|/ / | | | | | | PHPBB3-14378
* | [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-202-0/+111
|\ \ | | | | | | | | | [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-112-0/+102
| | | | | | | | | | | | PHPBB3-14177
* | | [prep-release-3.2.0-a2] Add migration for 3.2.0-a2Tristan Darricau2015-12-191-0/+38
| | |
* | | Merge branch '3.1.x'Joas Schilling2015-12-191-0/+31
|\ \ \ | | |/ | |/| | | | | | | Conflicts: build/build.xml
| * | [prep-release-3.1.7] Add migration to update the versionJoas Schilling2015-12-191-0/+31
| | |
* | | Merge branch '3.1.x'Joas Schilling2015-12-121-0/+32
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | 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
| * [prep-release-3.1.7] Add migration for 3.1.7-RC1Joas Schilling2015-12-121-0/+32
| |
* | [ticket/14344] Improve output of HTML errors trigged during installMarc Alexander2015-12-072-0/+8
| | | | | | | | PHPBB3-14344
* | Merge branch '3.1.x'Tristan Darricau2015-12-071-45/+35
|\ \ | |/ | | | | | | | | * 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-071-45/+35
| |\ | | | | | | | | | | | | | | | | | | | | | [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-271-45/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | [ticket/14334] Use phpbb_get_avatar() in user_loaderMarc Alexander2015-12-031-6/+1
| |/ | | | | | | PHPBB3-14334
* | [ticket/14345] Move new line to ternary comparisonMarc Alexander2015-12-071-3/+3
| | | | | | | | PHPBB3-14345
* | [ticket/14345] Check if description exists in message aryMarc Alexander2015-12-071-3/+6
| | | | | | | | PHPBB3-14345
* | Merge pull request #4046 from CHItA/ticket/14269Tristan Darricau2015-12-073-2/+135
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14269] Use http_exceptions in the installer instead of die() * CHItA/ticket/14269: [ticket/14269] Change HTTP status codes to 403 [ticket/14269] Fix comments and language var names [ticket/14269] Use http_exceptions in the installer instead of die()
| * | [ticket/14269] Change HTTP status codes to 403Mate Bartus2015-12-052-2/+2
| | | | | | | | | | | | PHPBB3-14269
| * | [ticket/14269] Fix comments and language var namesMate Bartus2015-12-033-4/+4
| | | | | | | | | | | | PHPBB3-14269
| * | [ticket/14269] Use http_exceptions in the installer instead of die()Mate Bartus2015-11-273-2/+135
| | | | | | | | | | | | PHPBB3-14269
* | | Merge pull request #4006 from brunoais/feature/sql-bool-builderTristan Darricau2015-12-051-17/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [feature/sql-bool-builder] New syntax for DBAL query builder for boolean generation * brunoais/feature/sql-bool-builder: [feature/sql-bool-builder] Fixing misuse of LOGICAL_OP instead of STATEMENTS [feature/sql-bool-builder] Fixing typos in previous commit [feature/sql-bool-builder] Changing syntax pt3. Don't use magic numbers [feature/sql-bool-builder] Changing syntax pt2. Fix tests [feature/sql-bool-builder] Changing syntax
| * | | [feature/sql-bool-builder] Fixing misuse of LOGICAL_OP instead of STATEMENTSbrunoais2015-11-241-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13652
| * | | [feature/sql-bool-builder] Fixing typos in previous commitbrunoais2015-11-121-2/+2
| | | | | | | | | | | | | | | | PHPBB3-13652
| * | | [feature/sql-bool-builder] Changing syntax pt3. Don't use magic numbersbrunoais2015-11-111-15/+24
| | | | | | | | | | | | | | | | PHPBB3-13652
| * | | [feature/sql-bool-builder] Changing syntaxbrunoais2015-11-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Changing the syntax used to the one Nicofuma suggested. PHPBB3-13652
* | | | Merge pull request #4005 from Elsensee/ticket/14257Tristan Darricau2015-12-054-60/+436
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14257] Reparse after update * Elsensee/ticket/14257: [ticket/14257] Add tests for reparser manager [ticket/14257] Fix CLI reparser and set cron interval [ticket/14257] Fix CLI error message [ticket/14257] Fix phpdoc in CLI command [ticket/14257] Add text_reparser manager [ticket/14257] Use migrations instead of cron job for some reparsers [ticket/14257] Fix lock acquire in CLI command [ticket/14257] Fix if condition [ticket/14257] Add reparse_lock to CLI command [ticket/14257] Add cron tasks for reparsing text
| * | | | [ticket/14257] Fix CLI reparser and set cron intervalOliver Schramm2015-11-084-25/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Fix phpdoc in CLI commandOliver Schramm2015-10-261-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Add text_reparser managerOliver Schramm2015-10-264-102/+181
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Use migrations instead of cron job for some reparsersOliver Schramm2015-10-251-0/+87
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Fix lock acquire in CLI commandOliver Schramm2015-10-251-22/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Fix if conditionOliver Schramm2015-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Add reparse_lock to CLI commandOliver Schramm2015-10-241-16/+34
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Add cron tasks for reparsing textOliver Schramm2015-10-241-0/+197
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
* | | | | Merge pull request #4055 from CHItA/ticket/14326Marc Alexander2015-12-032-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14326] Decode diffed file's content during update
| * | | | | [ticket/14326] Decode diffed file's content during updateMate Bartus2015-12-022-6/+6
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-14326
* | | | | [ticket/14320] Fix language selector in the installerMate Bartus2015-11-291-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-14320
* | | | [ticket/14308] Fix multibyte input for installerrxu2015-11-242-5/+5
| | | | | | | | | | | | | | | | PHPBB3-14308
* | | | Merge branch 'prep-release-3.2.0-a1'Tristan Darricau2015-11-2310-5/+116
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.2.0-a1: [prep-release-3.2.0-a1] Add changelog for 3.2.0-a1 [prep-release-3.2.0-a1] Add migration for 3.2.0-a1 [prep-release-3.2.0-a1] Update version to 3.2.0-a1