* 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: (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
* master: (156 commits)
added property docs to AR test classes
moved getPDOType() back to Command to avoid dependency on Schema
updated @property annotations of web\Request
moved redis out of yii\db namespace
Fixes#884.
Supports sending CSRF token via HTTP header.
Use .prop() instead .attr().
use meta tags to pass CSRF token.
Added memcached service in Travis YAML
fixed typo
cleanup db `use` statements
doc fix.
Better strtr arguments format
Modified js registration position.
renamed Request::csrfTokenName to csrfVar. added version, csrfVar and csrfToken to yii js module.
Advanced application enhancements.
Basic application enhancements.
Better phpdoc for AccessControl
Security::generateRandomKey enhancements:
Fixes#875: Security::generateRandomKey() can now be safely used in URLs
...
Conflicts:
.travis.yml
framework/yii/caching/RedisCache.php
tests/unit/framework/caching/RedisCacheTest.php
bit has special syntax for storing and retreiving so we'd need a
converter for that.
Storing 1 bit will result in one byte left padded on the disc so the
result of a query for boolean 0 will be 0x00 and for boolean 1 will be
0x80.
