* 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
* master: (131 commits)
css fix.
Finished model generator.
more tests for FileHelper
Added note about theme asset bundle to bootstrap widgets guide
fixed typos in ArrayHelperBase phpdoc
More tests for ArrayHelper and Inflector
Fixed typo and code style
Fixes#21: implemented jQueryUI Slider
Fixes#790: added visible for Nav and Dropdown
finished rule generation for model generator.
bug fix of form generator.
minor fixes of debugger.
Added SafeValidator.
fix dataProvider getSort()
cleanup MemCache timeout API after #804
Added failureCallback, reduced timeouts to 1s
Mentioning that timeoutms is available in memcache only.
set default format for gridview to text
Removed extra line
Added timeoutms parameter in MemCache
...
Conflicts:
tests/unit/data/config.php
* master: (806 commits)
avoid confusing docs about autoload return value
doc fix.
Fixed doc.
Fixed autoloader behavior according to leading \
Fix in RequestPanel
changed to trace from info.
Removed yii\debug\Module::enabled.
minor enhancement of debugger.
Refactored the basic app.
Added ErrorAction.
Use `hasAttribute()` instead to avoid code duplication
refactored NavBar and basic app navbar.
test break fix.
test break fix.
Fixed test breaks.
#735: removed hiddenInput to avoid confusion.
ResizableAsset typo fix!
Update radio and checkbox due to e3801fbf6b
css fix.
Fixed the basic app template.
...
Conflicts:
.travis.yml
tests/unit/data/config.php
