Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-08-31 | 1 | -66/+117 |
|\ | | | | | | | | | Conflicts: phpBB/phpbb/db/migration/tool/module.php | ||||
| * | Merge pull request #4377 from rxu/ticket/14703 | Marc Alexander | 2016-08-31 | 1 | -66/+117 |
| |\ | | | | | | | | | | [ticket/14703] Fix parent module selection for custom extension modules | ||||
| | * | [ticket/14703] Fix the docblock | rxu | 2016-07-24 | 1 | -2/+2 |
| | | | | | | | | | | | | PHPBB3-14703 | ||||
| | * | [ticket/14703] Fix existance checking if multiple parent module_langname found | rxu | 2016-07-24 | 1 | -9/+26 |
| | | | | | | | | | | | | PHPBB3-14703 | ||||
| | * | [ticket/14703] Add test for the case multiple parent module_langname found | rxu | 2016-07-24 | 1 | -5/+7 |
| | | | | | | | | | | | | PHPBB3-14703 | ||||
| | * | [ticket/14703] Select the parent module id from the several found | rxu | 2016-07-23 | 1 | -3/+22 |
| | | | | | | | | | | | | PHPBB3-14703 | ||||
| | * | [ticket/14703] Refine the parent module selection for custom extension modules | rxu | 2016-07-10 | 1 | -71/+79 |
| | | | | | | | | | | | | PHPBB3-14703 | ||||
| | * | [ticket/14703] Fix parent module selection for custom modules removal | rxu | 2016-07-03 | 1 | -2/+4 |
| | | | | | | | | | | | | PHPBB3-14703 | ||||
| | * | [ticket/14703] Fix parent module selection for custom extension modules | rxu | 2016-07-03 | 1 | -1/+4 |
| | | | | | | | | | | | | PHPBB3-14703 | ||||
* | | | Merge branch 'ticket/14742' into ticket/14742-32x | Oliver Schramm | 2016-08-20 | 6 | -59/+55 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: phpBB/phpbb/db/migrator.php | ||||
| * | | [ticket/14742] Reset migration_data_state before reverting | Oliver Schramm | 2016-08-20 | 1 | -1/+4 |
| | | | | | | | | | | | | PHPBB3-14742 | ||||
| * | | [ticket/14742] Change constants to use Symfony values | Oliver Schramm | 2016-08-20 | 1 | -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 too | Oliver Schramm | 2016-08-20 | 1 | -50/+34 |
| | | | | | | | | | | | | | | | | | | | | | Rewriting process_data_step() to remove the now useless foreach() loop. PHPBB3-14742 | ||||
| * | | [ticket/14742] Improve readability of the code | Oliver Schramm | 2016-08-20 | 1 | -0/+4 |
| | | | | | | | | | | | | PHPBB3-14742 | ||||
| * | | [ticket/14742] Fix comments in migrator | Oliver Schramm | 2016-08-20 | 5 | -5/+6 |
| | | | | | | | | | | | | PHPBB3-14742 | ||||
* | | | Merge branch 'ticket/14742' into ticket/14742-32x | Oliver Schramm | 2016-08-12 | 1 | -15/+58 |
|\ \ \ | |/ / | |||||
| * | | [ticket/14742] Enhance measured time for migrations | Oliver Schramm | 2016-08-12 | 1 | -5/+24 |
| | | | | | | | | | | | | PHPBB3-14742 | ||||
| * | | [ticket/14742] Improve verbosity of migrator output | Oliver Schramm | 2016-08-12 | 1 | -2/+6 |
| | | | | | | | | | | | | PHPBB3-14742 | ||||
* | | | [ticket/14742] Fix progress bar in database updater | Oliver Schramm | 2016-08-11 | 1 | -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-32x | Oliver Schramm | 2016-08-11 | 1 | -2/+28 |
|\ \ \ | |/ / | |||||
| * | | [ticket/14742] Avoid loop while reverting schema | Oliver Schramm | 2016-08-11 | 1 | -2/+7 |
| | | | | | | | | | | | | PHPBB3-14742 | ||||
| * | | [ticket/14742] Make $last_run_migration protected | Oliver Schramm | 2016-08-11 | 1 | -1/+14 |
| | | | | | | | | | | | | PHPBB3-14742 | ||||
| * | | [ticket/14742] Fix schema update | Oliver Schramm | 2016-08-11 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | First make it work, then avoid a loop PHPBB3-14742 | ||||
* | | | [ticket/14742] Display message if reverting schema is in progress | Oliver Schramm | 2016-08-11 | 1 | -4/+8 |
| | | | | | | | | | | | | PHPBB3-14742 | ||||
* | | | Merge branch 'ticket/14742' into ticket/14742-32x | Oliver Schramm | 2016-08-11 | 6 | -18/+76 |
|\ \ \ | |/ / | |||||
| * | | [ticket/14742] Small fixes to migrator | Oliver Schramm | 2016-08-11 | 1 | -4/+2 |
| | | | | | | | | | | | | PHPBB3-14742 | ||||
| * | | [ticket/14742] Avoid loop while reverting data | Oliver Schramm | 2016-08-11 | 6 | -12/+63 |
| | | | | | | | | | | | | | | | | | | This combines reverted updata_data and revert_data into a single array. PHPBB3-14742 | ||||
| * | | [ticket/14742] Pause after each schema change | Oliver Schramm | 2016-08-11 | 1 | -2/+11 |
| |/ | | | | | | | | | | | It is certainly better than running them all at once PHPBB3-14742 | ||||
* | | Merge pull request #4349 from marc1706/ticket/14665 | Andreas Fischer | 2016-07-10 | 1 | -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 migration | Marc Alexander | 2016-06-08 | 1 | -1/+2 |
| | | | | | | | | | PHPBB3-14665 | ||||
* | | | [prep-release-3.2.0-RC1] Add migration | Tristan Darricau | 2016-06-19 | 1 | -0/+40 |
|/ / | |||||
* | | [ticket/14607] Add missing auto_increment to report_id | Marc Alexander | 2016-05-01 | 1 | -0/+45 |
| | | | | | | | | PHPBB3-14607 | ||||
* | | Merge branch 'prep-release-3.2.0-b2' into 3.2.x | Tristan Darricau | 2016-04-28 | 1 | -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-b2 | Tristan Darricau | 2016-03-03 | 1 | -0/+40 |
| | | | |||||
* | | | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-04-16 | 1 | -0/+36 |
|\ \ \ | | |/ | |/| | |||||
| * | | [prep-release-3.1.9] Add migration for 3.1.9 | Joas Schilling | 2016-04-16 | 1 | -0/+36 |
| | | | |||||
* | | | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-04-09 | 1 | -0/+36 |
|\ \ \ | |/ / | |||||
| * | | [prep-release-3.1.9] Add migration for 3.1.9-RC1 | Joas Schilling | 2016-04-09 | 1 | -0/+36 |
| | | | |||||
* | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-04-03 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | | | | * 3.1.x: [ticket/14532] Do not escape column default in mssql | ||||
| * | | [ticket/14532] Do not escape column default in mssql | Marc Alexander | 2016-03-31 | 1 | -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.x | Marc Alexander | 2016-03-31 | 32 | -0/+160 |
|\ \ \ | |/ / | |||||
| * | | [ticket/14570] Use phpbb_version_compare | Matt Friedman | 2016-03-29 | 32 | -32/+32 |
| | | | | | | | | | | | | PHPBB3-14570 | ||||
| * | | [ticket/14570] Add effectively installed to 3.1.x versions | Matt Friedman | 2016-03-29 | 32 | -0/+160 |
| | | | | | | | | | | | | PHPBB3-14570 | ||||
* | | | Merge pull request #4243 from marc1706/ticket/14136-3.2.x | Tristan Darricau | 2016-03-24 | 1 | -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.x | Marc Alexander | 2016-03-24 | 1 | -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 tag | Marc Alexander | 2016-03-24 | 1 | -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 migration | Jakub Senko | 2016-03-18 | 1 | -1/+1 |
|/ / / | | | | | | | | | | PHPBB3-14318 | ||||
* | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-03-07 | 1 | -8/+5 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | [ticket/14514] Don't skip users when converting passwords | Oliver Schramm | 2016-03-06 | 1 | -8/+5 |
| | | | | | | | | PHPBB3-14514 | ||||
* | | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-02-18 | 1 | -0/+31 |
|\ \ | |/ | | | | | | | | | Conflicts: build/build.xml phpBB/composer.lock |