aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | [prep-release-3.2.0-a1] Add migration for 3.2.0-a1Tristan Darricau2015-11-0910-5/+116
| | |/ / | |/| |
* | | | Merge pull request #4016 from CHItA/ticket/14270Tristan Darricau2015-11-231-3/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14270] Purge cache when the installer is finished * CHItA/ticket/14270: [ticket/14270] Purge cache when the installer is finished
| * | | | [ticket/14270] Purge cache when the installer is finishedMate Bartus2015-11-081-3/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-14270
* | | | | [ticket/14281] Correctly pass parameters to add_error_messageMarc Alexander2015-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14281
* | | | | [ticket/14281] Fix installer CLI after recent changesMarc Alexander2015-11-102-3/+3
| |/ / / |/| | | | | | | | | | | PHPBB3-14281
* | | | [ticket/14278] Check if user_id is set and fall back to ANONYMOUSMarc Alexander2015-11-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14278
* | | | [ticket/14277] Use user_id if availableMate Bartus2015-11-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14277
* | | | [ticket/14277] Fix undefined index error in migrationsMate Bartus2015-11-081-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14277
* | | | Merge pull request #4019 from prototech/ticket/14273Marc Alexander2015-11-061-6/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14273] Remove unused core.root_path dependency in files.upload service
| * | | | [ticket/14273] Remove unused core.root_path dependency in files.upload serviceCesar G2015-11-051-6/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14273
* | | | | [ticket/14274] Include user functions during installerMatt Friedman2015-11-051-0/+5
|/ / / / | | | | | | | | | | | | PHPBB3-14274
* | | | Merge pull request #4010 from Elsensee/ticket/14264Máté Bartus2015-11-058-67/+11
|\ \ \ \ | |/ / / |/| | | [ticket/14264] Don't use constants as return values
| * | | [ticket/14264] Don't use constants as return valuesOliver Schramm2015-11-038-67/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent BC breaking in the future if we decide to get rid of constants. PHPBB3-14264
* | | | Merge pull request #3995 from CHItA/ticket/14044Tristan Darricau2015-11-0310-21/+83
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14044] Deduplicate the installers * CHItA/ticket/14044: [ticket/14044] Add config as global in notify user [ticket/14044] Fix language selection data loss [ticket/14044] Patch language::set_fallback_array() [ticket/14044] Fix tests [ticket/14044] Fix wrong descriptions in install [ticket/14044] Solve missing email template error [ticket/14044] global $table_prefix in constants.php [ticket/14044] Try to fix missing table prefix [ticket/14044] Use the correct language file version [ticket/14044] Automatically trigger rollback on insert in transaction [ticket/14044] Use empty instead of !count [ticket/14044] Fix Sqlite error in tests [ticket/14044] Deduplicate the installers
| * | | [ticket/14044] Add config as global in notify userMate Bartus2015-11-031-2/+5
| | | | | | | | | | | | | | | | PHPBB3-14044