aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-311-66/+117
|\ | | | | | | | | Conflicts: phpBB/phpbb/db/migration/tool/module.php
| * Merge pull request #4377 from rxu/ticket/14703Marc Alexander2016-08-311-66/+117
| |\ | | | | | | | | | [ticket/14703] Fix parent module selection for custom extension modules
| | * [ticket/14703] Fix the docblockrxu2016-07-241-2/+2
| | | | | | | | | | | | PHPBB3-14703
| | * [ticket/14703] Fix existance checking if multiple parent module_langname foundrxu2016-07-241-9/+26
| | | | | | | | | | | | PHPBB3-14703
| | * [ticket/14703] Add test for the case multiple parent module_langname foundrxu2016-07-241-5/+7
| | | | | | | | | | | | PHPBB3-14703
| | * [ticket/14703] Select the parent module id from the several foundrxu2016-07-231-3/+22
| | | | | | | | | | | | PHPBB3-14703
| | * [ticket/14703] Refine the parent module selection for custom extension modulesrxu2016-07-101-71/+79
| | | | | | | | | | | | PHPBB3-14703
| | * [ticket/14703] Fix parent module selection for custom modules removalrxu2016-07-031-2/+4
| | | | | | | | | | | | PHPBB3-14703
| | * [ticket/14703] Fix parent module selection for custom extension modulesrxu2016-07-031-1/+4
| | | | | | | | | | | | PHPBB3-14703
* | | Merge branch 'ticket/14742' into ticket/14742-32xOliver Schramm2016-08-206-59/+55
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/phpbb/db/migrator.php
| * | [ticket/14742] Reset migration_data_state before revertingOliver Schramm2016-08-201-1/+4
| | | | | | | | | | | | PHPBB3-14742
| * | [ticket/14742] Change constants to use Symfony valuesOliver Schramm2016-08-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is to avoid errors when comparing verbosity levels in a CLI output handler that is using Symfony's OutputInterface for example. PHPBB3-14742
| * | [ticket/14742] Pause after each update_data step tooOliver Schramm2016-08-201-50/+34
| | | | | | | | | | | | | | | | | | | | | Rewriting process_data_step() to remove the now useless foreach() loop. PHPBB3-14742
| * | [ticket/14742] Improve readability of the codeOliver Schramm2016-08-201-0/+4
| | | | | | | | | | | | PHPBB3-14742
| * | [ticket/14742] Fix comments in migratorOliver Schramm2016-08-205-5/+6
| | | | | | | | | | | | PHPBB3-14742
* | | Merge branch 'ticket/14742' into ticket/14742-32xOliver Schramm2016-08-121-15/+58
|\ \ \ | |/ /
| * | [ticket/14742] Enhance measured time for migrationsOliver Schramm2016-08-121-5/+24
| | | | | | | | | | | | PHPBB3-14742
| * | [ticket/14742] Improve verbosity of migrator outputOliver Schramm2016-08-121-2/+6
| | | | | | | | | | | | PHPBB3-14742
* | | [ticket/14742] Fix progress bar in database updaterOliver Schramm2016-08-111-0/+22
| | | | | | | | | | | | | | | | | | | | | Because of the new way, schema update steps are handled, the already misleading progress bar was even more misleading. This should fix it. PHPBB3-14742
* | | Merge branch 'ticket/14742' into ticket/14742-32xOliver Schramm2016-08-111-2/+28
|\ \ \ | |/ /
| * | [ticket/14742] Avoid loop while reverting schemaOliver Schramm2016-08-111-2/+7
| | | | | | | | | | | | PHPBB3-14742
| * | [ticket/14742] Make $last_run_migration protectedOliver Schramm2016-08-111-1/+14
| | | | | | | | | | | | PHPBB3-14742
| * | [ticket/14742] Fix schema updateOliver Schramm2016-08-111-1/+11
| | | | | | | | | | | | | | | | | | First make it work, then avoid a loop PHPBB3-14742
* | | [ticket/14742] Display message if reverting schema is in progressOliver Schramm2016-08-111-4/+8
| | | | | | | | | | | | PHPBB3-14742
* | | Merge branch 'ticket/14742' into ticket/14742-32xOliver Schramm2016-08-116-18/+76
|\ \ \ | |/ /
| * | [ticket/14742] Small fixes to migratorOliver Schramm2016-08-111-4/+2
| | | | | | | | | | | | PHPBB3-14742
| * | [ticket/14742] Avoid loop while reverting dataOliver Schramm2016-08-116-12/+63
| | | | | | | | | | | | | | | | | | This combines reverted updata_data and revert_data into a single array. PHPBB3-14742
| * | [ticket/14742] Pause after each schema changeOliver Schramm2016-08-111-2/+11
| |/ | | | | | | | | | | It is certainly better than running them all at once PHPBB3-14742
* | Merge pull request #4349 from marc1706/ticket/14665Andreas Fischer2016-07-101-1/+2
|\ \ | | | | | | | | | | | | | | | | | | [ticket/14665] Remove invalid syntax in report_id_auto_increment migration * marc1706/ticket/14665: [ticket/14665] Remove invalid syntax in report_id_auto_increment migration
| * | [ticket/14665] Remove invalid syntax in report_id_auto_increment migrationMarc Alexander2016-06-081-1/+2
| | | | | | | | | PHPBB3-14665
* | | [prep-release-3.2.0-RC1] Add migrationTristan Darricau2016-06-191-0/+40
|/ /
* | [ticket/14607] Add missing auto_increment to report_idMarc Alexander2016-05-011-0/+45
| | | | | | | | PHPBB3-14607
* | Merge branch 'prep-release-3.2.0-b2' into 3.2.xTristan Darricau2016-04-281-0/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | * prep-release-3.2.0-b2: [prep-release-3.2.0-b2] Add schema.json [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2 [prep-release-3.2.0-b2] Add migration for 3.2.0-b2 [prep-release-3.2.0-b2] Update version to 3.2.0-b2
| * | [prep-release-3.2.0-b2] Add migration for 3.2.0-b2Tristan Darricau2016-03-031-0/+40
| | |
* | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-04-161-0/+36
|\ \ \ | | |/ | |/|
| * | [prep-release-3.1.9] Add migration for 3.1.9Joas Schilling2016-04-161-0/+36
| | |
* | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-04-091-0/+36
|\ \ \ | |/ /
| * | [prep-release-3.1.9] Add migration for 3.1.9-RC1Joas Schilling2016-04-091-0/+36
| | |
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-04-031-1/+1
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/14532] Do not escape column default in mssql
| * | [ticket/14532] Do not escape column default in mssqlMarc Alexander2016-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The column default shouldn't be escaped for mssql. This is a regression from 743d816631292a2081af4c5f7fc2fad2aff17c58. Prior to that commit, the default value for the column was not escaped. Escaping it will cause SQL errors while altering columns. PHPBB3-14532
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-3132-0/+160
|\ \ \ | |/ /
| * | [ticket/14570] Use phpbb_version_compareMatt Friedman2016-03-2932-32/+32
| | | | | | | | | | | | PHPBB3-14570
| * | [ticket/14570] Add effectively installed to 3.1.x versionsMatt Friedman2016-03-2932-0/+160
| | | | | | | | | | | | PHPBB3-14570
* | | Merge pull request #4243 from marc1706/ticket/14136-3.2.xTristan Darricau2016-03-241-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14136] Add back X-UA-Compatible meta tag * marc1706/ticket/14136-3.2.x: [ticket/14136] Add back X-UA-Compatible meta tag
| * \ \ Merge branch 'ticket/14136' into ticket/14136-3.2.xMarc Alexander2016-03-241-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/style/install_update_diff.html phpBB/adm/style/installer_header.html phpBB/install/database_update.php phpBB/install/index.php phpBB/styles/subsilver2/template/overall_header.html phpBB/styles/subsilver2/template/simple_header.html phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html phpBB/styles/subsilver2/template/viewtopic_print.html
| | * | [ticket/14136] Add back X-UA-Compatible meta tagMarc Alexander2016-03-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously removed without needing to. Adding it back to force users to not emulate the page for previous versions of IE. The imagetoolbar http-equiv tag was not restored as IE does not contain that anymore since IE7. Also, the chome=1 has been removed from the X-UA-Compatible content as ChromeFrame does not receive any further updates since 2014 and is potentially broken. PHPBB3-14136
* | | | [ticket/14318] Fix SQL error in Notifications Board migrationJakub Senko2016-03-181-1/+1
|/ / / | | | | | | | | | PHPBB3-14318
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-071-8/+5
|\ \ \ | |/ / | | / | |/ |/|
| * [ticket/14514] Don't skip users when converting passwordsOliver Schramm2016-03-061-8/+5
| | | | | | | | PHPBB3-14514
* | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-181-0/+31
|\ \ | |/ | | | | | | | | Conflicts: build/build.xml phpBB/composer.lock