* master: (587 commits)
fixed typo
Fixes#1222: refactored jui/Widget, intorduced jui/Slider and jui/SliderInput
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Added example for dividers to bootstrap Nav
Checkboxlist documentation fix
Added "Using controller action to render errors"
Fix doc
Renamed DetailView attribute type to format
encode email in Formatter
Added default status code setting.
"yii\swiftmailer\Mailer" transport setup has been advanced to support constructor arguments and plugins.
fix rbac select statement
Comments cleanup.
Reverted closeButton
Nomenclature and code realignment.
better nginx config
guide about using bootstrap less files
Include Schema in new migrations by default
...
Conflicts:
framework/composer.json
tests/unit/data/config.php
* master: (613 commits)
fixed typo
Fixes#1222: refactored jui/Widget, intorduced jui/Slider and jui/SliderInput
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Added example for dividers to bootstrap Nav
Checkboxlist documentation fix
Added "Using controller action to render errors"
Fix doc
Renamed DetailView attribute type to format
encode email in Formatter
Added default status code setting.
"yii\swiftmailer\Mailer" transport setup has been advanced to support constructor arguments and plugins.
fix rbac select statement
Comments cleanup.
Reverted closeButton
Nomenclature and code realignment.
better nginx config
guide about using bootstrap less files
Include Schema in new migrations by default
...
Conflicts:
framework/yii/db/ActiveRecord.php
framework/yii/db/ActiveRelation.php
tests/unit/data/config.php