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.
Klimov Paul
c2694e7edc
Merge branch 'master' of github.com:yiisoft/yii2 into 2.1
Conflicts:
.travis.yml
build/controllers/PhpDocController.php
docs/guide-es/caching-data.md
docs/guide-es/concept-events.md
docs/guide-fr/concept-events.md
docs/guide-ja/caching-data.md
docs/guide-ja/concept-events.md
docs/guide-pt-BR/caching-data.md
docs/guide-pt-BR/concept-events.md
docs/guide-ru/caching-data.md
docs/guide-ru/concept-events.md
docs/guide-zh-CN/caching-data.md
docs/guide-zh-CN/concept-events.md
docs/guide/caching-data.md
docs/guide/concept-events.md
docs/guide/runtime-logging.md
framework/BaseYii.php
framework/base/BaseObject.php
framework/base/Security.php
framework/caching/DbCache.php
framework/caching/XCache.php
framework/classes.php
framework/db/ActiveQueryTrait.php
framework/db/ActiveRelationTrait.php
framework/db/BaseActiveRecord.php
framework/db/Query.php
framework/db/QueryBuilder.php
framework/db/TableSchema.php
framework/db/mssql/QueryBuilder.php
framework/db/mysql/QueryBuilder.php
framework/db/oci/QueryBuilder.php
framework/db/pgsql/QueryBuilder.php
framework/db/sqlite/QueryBuilder.php
framework/filters/PageCache.php
framework/grid/DataColumn.php
framework/helpers/BaseFileHelper.php
framework/helpers/BaseJson.php
framework/helpers/BaseMarkdown.php
framework/helpers/BaseUrl.php
framework/i18n/Formatter.php
framework/log/DbTarget.php
framework/log/SyslogTarget.php
framework/messages/sk/yii.php
framework/mutex/PgsqlMutex.php
framework/rbac/BaseManager.php
framework/rbac/DbManager.php
framework/rbac/PhpManager.php
framework/web/Request.php
framework/web/Response.php
framework/web/Session.php
framework/web/View.php
framework/widgets/ActiveForm.php
framework/widgets/FragmentCache.php
tests/framework/behaviors/TimestampBehaviorTest.php
tests/framework/db/CommandTest.php
tests/framework/db/mysql/connection/DeadLockTest.php
tests/framework/db/pgsql/CommandTest.php
tests/framework/filters/auth/BasicAuthTest.php
tests/framework/log/FileTargetTest.php
tests/framework/log/SyslogTargetTest.php
tests/framework/mail/BaseMailerTest.php
tests/framework/rbac/ManagerTestCase.php
|
7 years ago |
.. |
controllers
|
Merge branch 'master' of github.com:yiisoft/yii2 into 2.1
|
7 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 |