Permalink
Browse files

prepare for next release

  • Loading branch information...
1 parent e9e4a0d commit 8afee6565daa6d5a85c65c1839a50e520a8d8896 @qiangxue qiangxue committed Dec 30, 2012
Showing with 8 additions and 2 deletions.
  1. +3 −0 CHANGELOG
  2. +4 −1 UPGRADE
  3. +1 −1 framework/YiiBase.php
View
@@ -1,6 +1,9 @@
Yii Framework Change Log
========================
+Version 1.1.14 work in progress
+-------------------------------
+
Version 1.1.13 December 30, 2012
--------------------------------
- Bug #93: Criteria modification in CActiveRecord::beforeFind() did not apply when record was loaded in relational context. See UPGRADE instructions for details on behavior change. (cebe)
View
@@ -1,4 +1,4 @@
- Upgrading Instructions for Yii Framework v1.1.13
+ Upgrading Instructions for Yii Framework v1.1.14
================================================
!!!IMPORTANT!!!
@@ -17,6 +17,9 @@ General upgrade instructions
- Check if everything is OK, if not — revert from backup and post
issues to Yii issue tracker.
+Upgrading from v1.1.13
+----------------------
+
Upgrading from v1.1.12
----------------------
- Both jQuery and jQueryUI were updated. Check [jQuery UI upgrade guide](http://jqueryui.com/upgrade-guide/1.9/)
View
@@ -80,7 +80,7 @@ class YiiBase
*/
public static function getVersion()
{
- return '1.1.13';
+ return '1.1.14-dev';
}
/**

0 comments on commit 8afee65

Please sign in to comment.