* master: (30 commits)
Added SerialColumn to crud generated code.
Added ActionColumn. crud generator WIP.
Fixes#823: consistent interface naming
Advanced application template: Delete flash message after it was displayed
Fixes#901: Added $delete parameter to Session::getFlash().
Polished up the basic discussion of template alternatives
Advanced application template: removed unused scenario from User model
porting the fix from https://github.com/yiisoft/yii/pull/2894
Edited introduction
Fixes#898: supported different signature of MemCache::addServer().
Fixes#897.
Use str_replace() rather than implode-explode
Fix parenthesis typo in CRUD index template
Doing more editing...
test break fix.
Support ajax redirection.
Enable CSRF validation by default.
Supports more elements to use data-confirm and data-method attributes.
refactored Request::validateCsrfToken().
Fixed CSRF validation bug.
...
* 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 c2c12a9049ec321e77ee13bc7f8a9a8293596b21)
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.
