* master: (59 commits)
updated ext composer.json for issue labels
moved redis to extensions
fixed whitespaces
update composer to include sphinx
Added initial steps about configuring DB-based RBAC
Fixes#1297: CSRF not generated on error pages
fixes#1158 mentioned @web alias in docs
Merged RBAC draft into authorization
"yii\sphinx\ActiveQuery" updated to throw exception on conflict between "asArray" and "snippetByModel" options.
Code style and docs at "yii\sphinx\*" fixed.
Docs for Sphinx extension updated.
Redundant typecast removed from yii\sphinx\ActiveRecord::create()
yii\sphinx\Command reworked to extend yii\db\Command. yii\sphinx\DataReader removed.
Sphinx Active Record updated to be compatible with ActiveDataProvider.
Sphinx documentation updated.
Sphinx documentation updated.
Sphinx has many relation test prepared.
Sphinx Query refactored.
Create relation methods added to Sphinx Active Record.
Sphinx Query Builder updated to respect column types for where statements
...
* master:
Fixes#1253Fixes#1310: ActiveRelation does not preserve order of items on find via() and viaTable()
fixed limit/offset for sqlite,mysql and cubrid
fixed test break.
Fixed test break.
Fixes#1301: fixed scenario generation when there are "except" scenarios.
support for batch insert in sqlite older than 3.7.11
Fixes#1298: supporting route with trailing slash.
Fixes#1296: stricter check of dashes in route.
Fixes#1307: move batchInsert() to base class.
Update apps-advanced.md
* master:
Fixes#1248: url manager didn't handle array parameters well.
travis: speed up composer
fixes#1306
fixed travis and composer issue
fixed array helper test
fixed Sort test
some clarification on model docs
fixed Sort::params to be retrieved from Request instead of $_GET
revokeAll() implementation for PhpManager
revokeAll() implementation for DbManager
added abstract function revokeAll()
indentation fix
fixes#1303: Security::decrypt now returns null w/o error when null is passed as $data
Added link to new RBAC page
added link to forum thread
Basic information about RBAC
RBAC documentation
added revokeAll() test
refactored redis AR Query::scalar()
Conflicts:
.travis.yml
* master: (59 commits)
Refactored hasMany and hasOne so that they support cross-DBMS relationship.
removed unused asset.php files
fixed composer.json autoload pathes
fixed c&p error
allow installing yii2-dev and get the Yii.php file in the same place
updated dev composer.json dependencies
added composer.json for yii2-dev package
fixed broken UniqueValidator
removed call to nonexistsend property
cleanup redis AR
refactored Model and redis AR to allow drop of RecordSchema
refactored redis AR to relect the latest changes
"yii\swiftmailer\Mailer::createSwiftObject()" simplified.
fixed empty result in findByPk list
fixed problem with not closed transaction in deleteAll()
fixed broken test
apply changes to db\AR -> redis\AR
added dependency in db\AR -> redis\AR needs to be refactored later
redis AR cleanup
ensure atomicity of operations
...
Conflicts:
tests/unit/data/config.php
* 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
