* 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.
* 'master' of github.com:yiisoft/yii2:
Fixes#829: loginRequired now responds with HTTP 403 in case of AJAX or loginUrl is not set (reverted from commit c2c12a9049)
add missing return to module template
Update module.php
Fixes#829: loginRequired now responds with HTTP 403 in case of AJAX or loginUrl is not set
gii form width adjustment.
Make sure query cloning works as expected.
Fixed test break.
Fixes#828: refactored QueryBuilder::build()
- rename FileHelper::mkdir for API consistency
- changed default permission for directories to 775 instead of 777
- added some properties to classes that deal with files to allow control
over directory permissions.
* 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
