From 84e2f3ba08620d9b409cd1b871b56e0f733f7361 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sun, 1 Dec 2013 13:18:32 -0500 Subject: [PATCH 1/4] Fixed doc. --- apps/advanced/README.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/apps/advanced/README.md b/apps/advanced/README.md index 3a042ce..520c83a 100644 --- a/apps/advanced/README.md +++ b/apps/advanced/README.md @@ -73,20 +73,6 @@ You can then install the application using the following command: php composer.phar create-project --stability=alpha yiisoft/yii2-app-advanced advanced ~~~ -After the application is installed, switch to the project folder and run the following command -to initialize the application: - -~~~ -./init (or "init" on Windows) -~~~ - -You can then access the application through the following URLs, - -~~~ -http://localhost/advanced/frontend/web/ -http://localhost/advanced/backend/web/ -~~~ - GETTING STARTED --------------- From 7f10555d60bc481ea2b071f6c036773dd6d80687 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sun, 1 Dec 2013 13:23:40 -0500 Subject: [PATCH 2/4] prepare for 2.0.0-alpha release. --- apps/advanced/composer.json | 2 +- apps/basic/composer.json | 2 +- apps/benchmark/composer.json | 2 +- framework/CHANGELOG.md | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/advanced/composer.json b/apps/advanced/composer.json index 72268b4..c6535c4 100644 --- a/apps/advanced/composer.json +++ b/apps/advanced/composer.json @@ -12,7 +12,7 @@ "irc": "irc://irc.freenode.net/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "dev", + "minimum-stability": "alpha", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*", diff --git a/apps/basic/composer.json b/apps/basic/composer.json index a794341..80875b8 100644 --- a/apps/basic/composer.json +++ b/apps/basic/composer.json @@ -12,7 +12,7 @@ "irc": "irc://irc.freenode.net/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "dev", + "minimum-stability": "alpha", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*", diff --git a/apps/benchmark/composer.json b/apps/benchmark/composer.json index d980f9a..cffcd9a 100644 --- a/apps/benchmark/composer.json +++ b/apps/benchmark/composer.json @@ -15,7 +15,7 @@ "config": { "vendor-dir": "protected/vendor" }, - "minimum-stability": "dev", + "minimum-stability": "alpha", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*" diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 9fe5c8d..8e4a1fd 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -1,7 +1,7 @@ Yii Framework 2 Change Log ========================== -Version 2.0 alpha ------------------ +2.0 alpha, December 1, 2013 +--------------------------- - Initial release. From b0018e36439fa8b59b204e5e23820672777c1add Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sun, 1 Dec 2013 13:34:43 -0500 Subject: [PATCH 3/4] fixed version. --- framework/yii/BaseYii.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/yii/BaseYii.php b/framework/yii/BaseYii.php index e56d410..073476f 100644 --- a/framework/yii/BaseYii.php +++ b/framework/yii/BaseYii.php @@ -104,7 +104,7 @@ class BaseYii */ public static function getVersion() { - return '2.0-dev'; + return '2.0.0-alpha'; } /** From 3822ffd16a0658bdcdf9cafbd1dd3ad242df125d Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sun, 1 Dec 2013 13:43:09 -0500 Subject: [PATCH 4/4] prepare for next release. --- apps/advanced/composer.json | 2 +- apps/basic/composer.json | 2 +- apps/benchmark/composer.json | 2 +- framework/CHANGELOG.md | 6 +++++- framework/yii/BaseYii.php | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/advanced/composer.json b/apps/advanced/composer.json index c6535c4..72268b4 100644 --- a/apps/advanced/composer.json +++ b/apps/advanced/composer.json @@ -12,7 +12,7 @@ "irc": "irc://irc.freenode.net/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "alpha", + "minimum-stability": "dev", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*", diff --git a/apps/basic/composer.json b/apps/basic/composer.json index 80875b8..a794341 100644 --- a/apps/basic/composer.json +++ b/apps/basic/composer.json @@ -12,7 +12,7 @@ "irc": "irc://irc.freenode.net/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "alpha", + "minimum-stability": "dev", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*", diff --git a/apps/benchmark/composer.json b/apps/benchmark/composer.json index cffcd9a..d980f9a 100644 --- a/apps/benchmark/composer.json +++ b/apps/benchmark/composer.json @@ -15,7 +15,7 @@ "config": { "vendor-dir": "protected/vendor" }, - "minimum-stability": "alpha", + "minimum-stability": "dev", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*" diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 8e4a1fd..c460706 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -1,7 +1,11 @@ Yii Framework 2 Change Log ========================== -2.0 alpha, December 1, 2013 +2.0.0 beta under development +---------------------------- + + +2.0.0 alpha, December 1, 2013 --------------------------- - Initial release. diff --git a/framework/yii/BaseYii.php b/framework/yii/BaseYii.php index 073476f..9343764 100644 --- a/framework/yii/BaseYii.php +++ b/framework/yii/BaseYii.php @@ -104,7 +104,7 @@ class BaseYii */ public static function getVersion() { - return '2.0.0-alpha'; + return '2.0.0-dev'; } /**