aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | [ticket/14044] Fix language selection data lossMate Bartus2015-10-304-3/+6
| | | | | | | | | | | | PHPBB3-14044
| * | [ticket/14044] Patch language::set_fallback_array()Mate Bartus2015-10-301-2/+2
| | | | | | | | | | | | PHPBB3-14044
| * | [ticket/14044] Fix wrong descriptions in installMate Bartus2015-10-281-1/+1
| | | | | | | | | | | | PHPBB3-14044
| * | [ticket/14044] Solve missing email template errorMate Bartus2015-10-282-1/+17
| | | | | | | | | | | | PHPBB3-14044
| * | [ticket/14044] global $table_prefix in constants.phpMate Bartus2015-10-281-4/+0
| | | | | | | | | | | | PHPBB3-14044
| * | [ticket/14044] Try to fix missing table prefixMate Bartus2015-10-281-0/+4
| | | | | | | | | | | | PHPBB3-14044
| * | [ticket/14044] Automatically trigger rollback on insert in transactionMarc Alexander2015-10-232-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will cause the sqlite3 driver to automatically rollback transactions if an insert fails during a transaction. Other dbms trigger a rollback inside the sql_error() function with a rollback command. However, this manual rollback command might fail on sqlite3 due to ongoing queries. With this change, sqlite3 itself will abort any ongoing queries and initiate the rollback automatically. Since manually triggered rollbacks will fail after the rollback was started automatically, we catch exceptions output by the exec() command during rollback and any exception that might be thrown by fetchArray() due to aborted queries. PHPBB3-14044
| * | [ticket/14044] Use empty instead of !countMate Bartus2015-10-231-1/+1
| | | | | | | | | | | | PHPBB3-14044
| * | [ticket/14044] Fix Sqlite error in testsMarc Alexander2015-10-232-5/+19
| | | | | | | | | | | | PHPBB3-14044
| * | [ticket/14044] Deduplicate the installersMate Bartus2015-10-224-12/+34
| | | | | | | | | | | | PHPBB3-14044
* | | Merge pull request #3971 from VSEphpbb/ticket/14237Oliver Schramm2015-10-2917-73/+112
|\ \ \ | |_|/ |/| | | | | [ticket/14237] Use $language class for notifications
| * | [ticket/14237] Consistent references to classes in docblocksMatt Friedman2015-10-141-3/+3
| | | | | | | | | PHPBB3-14237
| * | [ticket/14237] Use $language class for notificationsMatt Friedman2015-10-1317-76/+115
| | | | | | | | | | | | PHPBB3-14237
* | | Merge branch '3.1.x'Marc Alexander2015-10-241-0/+19
|\ \ \ | |_|/ |/| |
| * | [ticket/14258] Add event into auth::login before session creationPaul Sohier2015-10-241-1/+1
| | | | | | | | | | | | | | | | | | Fix typo PHPBB3-14258
| * | [ticket/14258] Add event into auth::login before session creationPaul Sohier2015-10-241-8/+7
| | | | | | | | | | | | | | | | | | Update comments regarding variables. PHPBB3-14258