Merge branch 'release/v1.2-beta1' into develop

README.md

@@ -2,11 +2,11 @@
 
 * [Website](http://pyrocms.com/)
 * [Documentation](http://pyrocms.com/documentation)
-* Version: 1.1.0
+* Version: 1.2.0
 
 ## Team
 
-* [Philip Sturgeon](http://philsturgeon.co.uk/)
+* [Phil Sturgeon](http://philsturgeon.co.uk/)
 * [Eric Barnes](http://ericlbarnes.com/)
 * [Stephen Cozart](http://twitter.com/stephencozart)
 * [Jerel Unruh](http://www.unruhdesigns.com/)
@@ -45,7 +45,7 @@ Before reporting bugs or requesting any features, please check that it does not
 * [Dan Horrigan](http://dhorrigan.com/)
 * [Ben Edmunds](http://benedmunds.com/)
 
-Think you should be on this list? Add your name to it with your next bug pull request. We can't list everybody because there are loads of you.
+Think you should be on this list? Add yourself in the next pull request you submit.
 
 [All Contributors](https://github.com/pyrocms/pyrocms/contributors)
 

documentation/general/changelog.html

@@ -1,17 +1,36 @@
 <h2>Change Log</h2>
 
-<h3>v1.1.1</h3>
+<h3>v1.2.0</h3>
 
 <ul>
+	<li>Pages in CP > Pages can be sorted and assigned to different parents via drag drop in an improved tree view.</li>
+	<li>Comments can be disabled for a specific blog post.</li>
+	<li>Added support for the ENVIRONMENT constant in CodeIgniter and deprecated ENV.</li>
+	<li>Live and QA sites will no longer output PHP notices, warnings or errors. Check logs if things go wrong on the live site.</li>
+	<li>
 	<li>Allowed the pyro: trigger to be set to whatever the developer likes in the new config/tags.php file.</li>
 	<li>Any page can now be set as the home-page.</li>
 	<li>Breadcrumbs will be automatically set for the entire trail of pages.</li>
+	<li>Upgraded to CodeIgniter 2.0.1.</li>
+	<li>Ran all png's through pngcrush to save some file-space and decrease load times.</li>
+	<li>Added Greek, Hebrew and Slovenian language support.</li>
+	<li>Inline documentation can now be multi-lingual.</li>
+	<li>iPhones and iPads should now been seen as mobile devices.</li>
+	<li>Hide the graph if the Google Analytics details are not filled in.</li>
+	<li>Renamed the Cache library to PyroCache to stop it blocking the new Cache library in CodeIgniter.</li>
 </ul>
 
 <h4>Bugs</h4>
 
 <ul>
+	<li>Fixed blog breadcrumbs.</li>
+	<li>Fixed a whole host of bugs in Files module.</li>
+	<li>Disabled the referal checking in modules admin controller as it was screwing with IE.</li>
+	<li>Fixed issue #369: Improved the current navigation class.</li>
 	<li>Fixed issue #377 - After delete installer get a PHP Error notice</li>
+	<li>Fixed issue #385 with validation field is_home added</li>
+	<li>Fixed issue #378.  Did NOT add support to change the Nav group on a page edit.</li>
+	<li>Fixed issue #404 - Typo in contact template SQL</li>
 </ul>
 
 <h3>v1.1.0</h3>

documentation/index.html

@@ -24,7 +24,7 @@
 		<header id="main-header">
 			<img src="assets/images/logo.png" class="logo" />
 
-			<h1><a href="./">PyroCMS Documentation</a> : v1.1.0</h1>
+			<h1><a href="./">PyroCMS Documentation</a> : v1.2.0</h1>
 
 			<nav id="nav-main">
 				<ul>

installer/config/constants.php

@@ -91,4 +91,4 @@
 |
 */
 
-define('CMS_VERSION', '1.1.0');
+define('CMS_VERSION', '1.2.0-beta1');

system/pyrocms/config/constants.php

@@ -42,7 +42,7 @@
 |--------------------------------------------------------------------------
 */
 
-# Deprecated: This feature was rolled into CodeIgniter so we don't need to handle it ourselves anymore.
+# Deprecated v1.2.0-beta1 This feature was rolled into CodeIgniter so we don't need to handle it ourselves anymore.
 define('ENV', ENVIRONMENT);
 
 /*
@@ -92,7 +92,7 @@
 |
 */
 
-define('CMS_VERSION', '1.1.0');
+define('CMS_VERSION', '1.2.0-beta1');
 
 /*
 |--------------------------------------------------------------------------
@@ -103,7 +103,7 @@
 |
 */
 
-define('CMS_DATE', '01/03/2011');
+define('CMS_DATE', '18/05/2011');
 
 /* End of file constants.php */
 /* Location: ./system/application/config/constants.php */

system/pyrocms/migrations/019_Add_blog_comments_enabled.php

@@ -5,13 +5,15 @@ class Migration_Add_blog_comments_enabled extends Migration {
 	function up()
 	{
 		$this->dbforge->add_column('blog', array(
-			'`comments_enabled`' => array(
+			'comments_enabled' => array(
 				'type' => 'int',
 				'constraint' => 1,
 				'null' => FALSE,
 				'default' => 1
 			)
 		));
+
+		$this->db->update('blog', array('comments_enabled' => 1));
 	}
 
 	function down()