* '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.
* 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 e3801fbf6bdf167c31f4f2bbb774f75659956d57
css fix.
Fixed the basic app template.
...
Conflicts:
.travis.yml
tests/unit/data/config.php
