You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
SilverFire - Dmitry Naumenko
e164c07145
Merge branch 'master' into 2.1
Conflicts:
.travis.yml
README.md
composer.json
docs/guide-ja/caching-data.md
docs/guide-ja/concept-behaviors.md
docs/guide-ja/concept-events.md
docs/guide-ja/db-active-record.md
docs/guide-ja/input-file-upload.md
docs/guide-ja/start-installation.md
docs/guide-ja/test-fixtures.md
docs/guide-ja/tutorial-console.md
docs/guide-ja/tutorial-core-validators.md
docs/guide-zh-CN/caching-data.md
docs/guide-zh-CN/db-active-record.md
docs/guide-zh-CN/runtime-responses.md
docs/guide-zh-CN/runtime-sessions-cookies.md
docs/guide-zh-CN/start-installation.md
docs/guide-zh-CN/tutorial-core-validators.md
docs/guide/README.md
docs/guide/caching-data.md
docs/guide/rest-resources.md
docs/guide/structure-extensions.md
framework/BaseYii.php
framework/UPGRADE.md
framework/caching/ArrayCache.php
framework/caching/DbCache.php
framework/captcha/Captcha.php
framework/captcha/CaptchaAction.php
framework/composer.json
framework/console/controllers/CacheController.php
framework/db/mssql/QueryBuilder.php
framework/db/oci/conditions/InConditionBuilder.php
framework/db/pgsql/ColumnSchema.php
framework/filters/ContentNegotiator.php
framework/filters/Cors.php
framework/messages/el/yii.php
framework/mutex/OracleMutex.php
framework/rest/OptionsAction.php
framework/web/Request.php
framework/web/Response.php
framework/web/UploadedFile.php
tests/framework/caching/MemCacheTest.php
tests/framework/db/ConnectionTest.php
tests/framework/db/mysql/QueryBuilderTest.php
tests/framework/filters/ContentNegotiatorTest.php
tests/framework/helpers/HtmlTest.php
tests/framework/log/TargetTest.php
|
6 years ago |
.. |
controllers
|
Merge branch 'master' into 2.1
|
6 years ago |
.htaccess
|
Converted CRLF to LF. Added gitattributes file.
|
11 years ago |
build
|
Enable `include` rule in php-cs-fixer (#14418)
|
7 years ago |
build.bat
|
minor doc update.
|
11 years ago |
build.xml
|
changed composer setting to match all requirements.
|
11 years ago |