-
Merge branch 'master' into redis · d8d6d1e3Carsten Brandt authored
* 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
d8d6d1e3
×