* master: (59 commits)
updated ext composer.json for issue labels
moved redis to extensions
fixed whitespaces
update composer to include sphinx
Added initial steps about configuring DB-based RBAC
Fixes#1297: CSRF not generated on error pages
fixes#1158 mentioned @web alias in docs
Merged RBAC draft into authorization
"yii\sphinx\ActiveQuery" updated to throw exception on conflict between "asArray" and "snippetByModel" options.
Code style and docs at "yii\sphinx\*" fixed.
Docs for Sphinx extension updated.
Redundant typecast removed from yii\sphinx\ActiveRecord::create()
yii\sphinx\Command reworked to extend yii\db\Command. yii\sphinx\DataReader removed.
Sphinx Active Record updated to be compatible with ActiveDataProvider.
Sphinx documentation updated.
Sphinx documentation updated.
Sphinx has many relation test prepared.
Sphinx Query refactored.
Create relation methods added to Sphinx Active Record.
Sphinx Query Builder updated to respect column types for where statements
...
* master: (59 commits)
Refactored hasMany and hasOne so that they support cross-DBMS relationship.
removed unused asset.php files
fixed composer.json autoload pathes
fixed c&p error
allow installing yii2-dev and get the Yii.php file in the same place
updated dev composer.json dependencies
added composer.json for yii2-dev package
fixed broken UniqueValidator
removed call to nonexistsend property
cleanup redis AR
refactored Model and redis AR to allow drop of RecordSchema
refactored redis AR to relect the latest changes
"yii\swiftmailer\Mailer::createSwiftObject()" simplified.
fixed empty result in findByPk list
fixed problem with not closed transaction in deleteAll()
fixed broken test
apply changes to db\AR -> redis\AR
added dependency in db\AR -> redis\AR needs to be refactored later
redis AR cleanup
ensure atomicity of operations
...
Conflicts:
tests/unit/data/config.php
* master: (587 commits)
fixed typo
Fixes#1222: refactored jui/Widget, intorduced jui/Slider and jui/SliderInput
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Added example for dividers to bootstrap Nav
Checkboxlist documentation fix
Added "Using controller action to render errors"
Fix doc
Renamed DetailView attribute type to format
encode email in Formatter
Added default status code setting.
"yii\swiftmailer\Mailer" transport setup has been advanced to support constructor arguments and plugins.
fix rbac select statement
Comments cleanup.
Reverted closeButton
Nomenclature and code realignment.
better nginx config
guide about using bootstrap less files
Include Schema in new migrations by default
...
Conflicts:
framework/composer.json
tests/unit/data/config.php
* master: (613 commits)
fixed typo
Fixes#1222: refactored jui/Widget, intorduced jui/Slider and jui/SliderInput
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Added example for dividers to bootstrap Nav
Checkboxlist documentation fix
Added "Using controller action to render errors"
Fix doc
Renamed DetailView attribute type to format
encode email in Formatter
Added default status code setting.
"yii\swiftmailer\Mailer" transport setup has been advanced to support constructor arguments and plugins.
fix rbac select statement
Comments cleanup.
Reverted closeButton
Nomenclature and code realignment.
better nginx config
guide about using bootstrap less files
Include Schema in new migrations by default
...
Conflicts:
framework/yii/db/ActiveRecord.php
framework/yii/db/ActiveRelation.php
tests/unit/data/config.php
* 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
removed test param 'appClass' as it does not make sense to configure
application class for all tests, some explicitly need webapp where
some might explicitly need console app.
* 'unittest-app-dependency' of https://github.com/bwoester/yii2:
mod: incorporate suggestions - rename requireApp() to mockApplication() - always destroy app on tearDown() - eliminates need for constant YII_DESTROY_APP_ON_TEARDOWN - mockApplication() becomes a lot easier. Destroying app on each tearDown means creating it on every call is fine. No more checking if it already exists and if it has been created from the same config. - \yii::$app should have been \Yii::$app
add: new key for unit tests config named "className". Allows to run the tests using different Application instances (consoleApp/ webApp) mod: TestCase::getParam accepts second param $default=null
mod: don't create app in bootstrap script, unit tests do it themselves add: option to destroy app after each test to find unit tests that fail to require an app
allow unit tests to requireApp() on setUp()
Conflicts:
tests/unit/data/config.php
