Merge pull request #2 from yiisoft/master

apps/advanced/frontend/widgets/Alert.php

@@ -58,12 +58,12 @@ class Alert extends \yii\bootstrap\Widget
         foreach ($flashes as $type => $data) {
             if (isset($this->alertTypes[$type])) {
                 $data = (array) $data;
-                foreach ($data as $message) {
+                foreach ($data as $i => $message) {
                     /* initialize css class for each alert box */
                     $this->options['class'] = $this->alertTypes[$type] . $appendCss;
 
                     /* assign unique id to each alert box */
-                    $this->options['id'] = $this->getId() . '-' . $type;
+                    $this->options['id'] = $this->getId() . '-' . $type . '-' . $i;
 
                     echo \yii\bootstrap\Alert::widget([
                         'body' => $message,

docs/guide-ja/README.md

@@ -76,8 +76,8 @@ All Rights Reserved.
 
 * [データアクセスオブジェクト](db-dao.md): データベースへの接続、基本的なクエリ、トランザクション、および、スキーマ操作
 * [クエリビルダ](db-query-builder.md): シンプルな抽象レイヤを使ってデータベースに対してクエリを行う
-* **翻訳中** [アクティブレコード](db-active-record.md): アクティブレコード ORM、レコードの読み出しと操作、リレーションの定義
-* **翻訳中** [マイグレーション](db-migrations.md): チーム開発環境においてデータベースにバージョンコントロールを適用
+* [アクティブレコード](db-active-record.md): アクティブレコード ORM、レコードの読み出しと操作、リレーションの定義
+* [マイグレーション](db-migrations.md): チーム開発環境においてデータベースにバージョンコントロールを適用
 * **TBD** [Sphinx](db-sphinx.md)
 * **TBD** [Redis](db-redis.md)
 * **TBD** [MongoDB](db-mongodb.md)

docs/guide-ru/tutorial-advanced-app.md

@@ -39,7 +39,7 @@
     php /path/to/yii-application/init
     ```
 
-    Для производственных сервером удобно выполнять данную команду в неинтерактивном режиме.
+    Для производственных серверов удобно выполнять данную команду в неинтерактивном режиме.
 
     ```
     php /path/to/yii-application/init --env=Production overwrite=All
@@ -139,7 +139,7 @@
 - `frontend/config/main.php`
 - `frontend/config/main-local.php`
 
-Парамтры считываются в следующем порядке:
+Параметры считываются в следующем порядке:
 
 - `common/config/params.php`
 - `common/config/params-local.php`

docs/guide/db-active-record.md

@@ -33,7 +33,7 @@ Below is the list of databases that are currently supported by Yii Active Record
 * MySQL 4.1 or later: via [[yii\db\ActiveRecord]]
 * PostgreSQL 7.3 or later: via [[yii\db\ActiveRecord]]
 * SQLite 2 and 3: via [[yii\db\ActiveRecord]]
-* Microsoft SQL Server 2010 or later: via [[yii\db\ActiveRecord]]
+* Microsoft SQL Server 2008 or later: via [[yii\db\ActiveRecord]]
 * Oracle: via [[yii\db\ActiveRecord]]
 * CUBRID 9.3 or later: via [[yii\db\ActiveRecord]] (Note that due to a [bug](http://jira.cubrid.org/browse/APIS-658) in
   the cubrid PDO extension, quoting of values will not work, so you need CUBRID 9.3 as the client as well as the server)

docs/guide/db-dao.md

@@ -15,7 +15,7 @@ By default, Yii supports the following DBMS:
 - [CUBRID](http://www.cubrid.org/): version 9.3 or higher. (Note that due to a [bug](http://jira.cubrid.org/browse/APIS-658) in
   the cubrid PDO extension, quoting of values will not work, so you need CUBRID 9.3 as the client as well as the server)
 - [Oracle](http://www.oracle.com/us/products/database/overview/index.html)
-- [MSSQL](https://www.microsoft.com/en-us/sqlserver/default.aspx): version 2005 or higher.
+- [MSSQL](https://www.microsoft.com/en-us/sqlserver/default.aspx): version 2008 or higher.
 
 
 Configuration

docs/guide/security-authorization.md

@@ -302,11 +302,6 @@ For applications that require complex access control with dynamically updated au
 (i.e. admin panel) may need to be developed using APIs offered by `authManager`.
 
 
-> Tip: By default, [[yii\rbac\PhpManager]] stores RBAC data in three files: `@app/rbac/items.php`, `@app/rbac/assignments.php` and `@app/rbac/rules.php`.
-  Make sure these files are writable by the Web server process if the authorization needs to be changed online.
-  Sometimes you will need to create these files manually.
-
-
 ### Using Rules
 
 As aforementioned, rules add additional constraint to roles and permissions. A rule is a class extending

framework/CHANGELOG.md

@@ -4,7 +4,7 @@ Yii Framework 2 Change Log
 2.0.2 under development
 -----------------------
 
-- no changes in this release.
+- Bug #6404: advanced application template `Alert` widget was generating duplicate IDs in case of multiple flashes (SDKiller)
 
 
 2.0.1 December 07, 2014

framework/widgets/BaseListView.php

@@ -32,11 +32,15 @@ abstract class BaseListView extends Widget
     /**
      * @var array the configuration for the pager widget. By default, [[LinkPager]] will be
      * used to render the pager. You can use a different widget class by configuring the "class" element.
+     * Note that the widget must support the `pagination` property which will be populated with the `pagination` value
+     * of [[dataProvider]].
      */
     public $pager = [];
     /**
      * @var array the configuration for the sorter widget. By default, [[LinkSorter]] will be
      * used to render the sorter. You can use a different widget class by configuring the "class" element.
+     * Note that the widget must support the `sort` property which will be populated with the `sort` value
+     * of [[dataProvider]].
      */
     public $sorter = [];
     /**