From db46d02ac23b8e0bc2416e197494d3b795b57530 Mon Sep 17 00:00:00 2001 From: Kyle Farris Date: Fri, 14 Oct 2011 15:17:09 -0400 Subject: trying to resolve some merge issues --- application/config/migration.php | 82 ++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'application/config/migration.php') diff --git a/application/config/migration.php b/application/config/migration.php index dba870010..d88554d91 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -1,42 +1,42 @@ -migration->latest() this is the version that schema will -| be upgraded / downgraded to. -| -*/ -$config['migration_version'] = 0; - - -/* -|-------------------------------------------------------------------------- -| Migrations Path -|-------------------------------------------------------------------------- -| -| Path to your migrations folder. -| Typically, it will be within your application path. -| Also, writing permission is required within the migrations path. -| -*/ -$config['migration_path'] = APPPATH . 'migrations/'; - - -/* End of file migration.php */ +migration->latest() this is the version that schema will +| be upgraded / downgraded to. +| +*/ +$config['migration_version'] = 0; + + +/* +|-------------------------------------------------------------------------- +| Migrations Path +|-------------------------------------------------------------------------- +| +| Path to your migrations folder. +| Typically, it will be within your application path. +| Also, writing permission is required within the migrations path. +| +*/ +$config['migration_path'] = APPPATH . 'migrations/'; + + +/* End of file migration.php */ /* Location: ./application/config/migration.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 5494077cd755effc3204cdba8bfac5bd2d8ad74d Mon Sep 17 00:00:00 2001 From: Kyle Farris Date: Fri, 14 Oct 2011 16:50:14 -0300 Subject: Fixed merge error. --- application/config/migration.php | 1 - 1 file changed, 1 deletion(-) (limited to 'application/config/migration.php') diff --git a/application/config/migration.php b/application/config/migration.php index 41b89626f..8f3a2f6c5 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -111,5 +111,4 @@ $config['migration_path'] = APPPATH . 'migrations/'; /* End of file migration.php */ ->>>>>>> a2125a5d830fd390b4cf35f77e9bb0558cfa2dd7:application/config/migration.php /* Location: ./application/config/migration.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 02e7c8b14d53e4b4b5334c6ae64e49c211f56bf1 Mon Sep 17 00:00:00 2001 From: Kyle Farris Date: Fri, 14 Oct 2011 16:51:07 -0300 Subject: REALLY fixed merge problem. --- application/config/migration.php | 43 ---------------------------------------- 1 file changed, 43 deletions(-) (limited to 'application/config/migration.php') diff --git a/application/config/migration.php b/application/config/migration.php index 8f3a2f6c5..3ca47f688 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -1,46 +1,3 @@ -<<<<<<< HEAD:application/config/migration.php -migration->latest() this is the version that schema will -| be upgraded / downgraded to. -| -*/ -$config['migration_version'] = 0; - - -/* -|-------------------------------------------------------------------------- -| Migrations Path -|-------------------------------------------------------------------------- -| -| Path to your migrations folder. -| Typically, it will be within your application path. -| Also, writing permission is required within the migrations path. -| -*/ -$config['migration_path'] = APPPATH . 'migrations/'; - - -/* End of file migration.php */ -======= Date: Thu, 20 Oct 2011 12:18:42 -0500 Subject: adding new license file (OSL 3.0) and updating readme to ReST added notice of license to all source files. OSL to all except the few files we ship inside of the application folder, those are AFL. Updated license in user guide. incrementing next dev version to 3.0 due to licensing change --- application/config/migration.php | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'application/config/migration.php') diff --git a/application/config/migration.php b/application/config/migration.php index 3ca47f688..150d414d9 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -1,4 +1,30 @@ - Date: Fri, 21 Oct 2011 09:55:40 -0500 Subject: fixing typo in attribution block --- application/config/migration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/migration.php') diff --git a/application/config/migration.php b/application/config/migration.php index 150d414d9..187a499ec 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -8,7 +8,7 @@ * * Licensed under the Academic Free License version 3.0 * - * This source file is subject to the Open Software License (OSL 3.0) that is + * This source file is subject to the Academic Free License (AFL 3.0) that is * bundled with this package in the files license_afl.txt / license_afl.rst. * It is also available through the world wide web at this URL: * http://opensource.org/licenses/AFL-3.0 -- cgit v1.2.3-24-g4f1b From 5543fd7ba20a1ddc9bdd0fb9505c1de310e9b833 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Thu, 27 Oct 2011 01:55:56 +0100 Subject: Added long missing Migration documentation. --- application/config/migration.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'application/config/migration.php') diff --git a/application/config/migration.php b/application/config/migration.php index dba870010..afa264562 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -4,9 +4,8 @@ | Enable/Disable Migrations |-------------------------------------------------------------------------- | -| Migrations are disabled by default for security reasons. -| You should enable migrations whenever you intend to do a schema migration -| and disable it back when you're done. +| Migrations are disabled by default but should be enabled +| whenever you intend to do a schema migration. | */ $config['migration_enabled'] = FALSE; -- cgit v1.2.3-24-g4f1b From dd81c435c145792e79e17f5a51f5c036adbc8044 Mon Sep 17 00:00:00 2001 From: Eric Barnes Date: Wed, 16 Nov 2011 11:07:35 -0500 Subject: Migrations - Changed config migration_version to state it is used in migration->current. Removed white space and coding standards. --- application/config/migration.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'application/config/migration.php') diff --git a/application/config/migration.php b/application/config/migration.php index 187a499ec..f56857401 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -5,9 +5,9 @@ * An open source application development framework for PHP 5.1.6 or newer * * NOTICE OF LICENSE - * + * * Licensed under the Academic Free License version 3.0 - * + * * This source file is subject to the Academic Free License (AFL 3.0) that is * bundled with this package in the files license_afl.txt / license_afl.rst. * It is also available through the world wide web at this URL: @@ -43,7 +43,7 @@ $config['migration_enabled'] = FALSE; |-------------------------------------------------------------------------- | | This is the name of the table that will store the current migrations state. -| When migrations runs it will store in a database table which migration +| When migrations runs it will store in a database table which migration | level the system is at. It then compares the migration level in the this | table to the $config['migration_version'] if they are not the same it | will migrate up. This must be set. @@ -51,13 +51,12 @@ $config['migration_enabled'] = FALSE; */ $config['migration_table'] = 'migrations'; - /* |-------------------------------------------------------------------------- | Auto Migrate To Latest |-------------------------------------------------------------------------- | -| If this is set to TRUE when you load the migrations class and have +| If this is set to TRUE when you load the migrations class and have | $config['migration_enabled'] set to TRUE the system will auto migrate | to your latest migration (whatever $config['migration_version'] is | set to). This way you do not have to call migrations anywhere else @@ -66,20 +65,18 @@ $config['migration_table'] = 'migrations'; */ $config['migration_auto_latest'] = FALSE; - /* |-------------------------------------------------------------------------- | Migrations version |-------------------------------------------------------------------------- | | This is used to set migration version that the file system should be on. -| If you run $this->migration->latest() this is the version that schema will +| If you run $this->migration->current() this is the version that schema will | be upgraded / downgraded to. | */ $config['migration_version'] = 0; - /* |-------------------------------------------------------------------------- | Migrations Path -- cgit v1.2.3-24-g4f1b From 0defe5d33ee2633f377a109519ca818becc60f64 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Sun, 1 Jan 2012 18:46:41 -0600 Subject: Updating copyright date to 2012 --- application/config/migration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/migration.php') diff --git a/application/config/migration.php b/application/config/migration.php index 4fb027b8e..668c35740 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0) * @link http://codeigniter.com * @since Version 1.0 -- cgit v1.2.3-24-g4f1b