Merge branch 'master' into bootstrap
* master: (84 commits) remove from master (update track) minor fixes updated the README file of the bootstrap app. Inflector class readjusting files for the framework package. renamed files. Added punycode as part of the framework. Renamed core asset bundles. fixed wrong dependency name. Added bootstrap bundles. Reorganized the bootstrap app to prepare it as a separate composer package. Update Pagination.php "ManagerTestBase::testExecuteBizRule()" has been fixed to not produce side effects on other tests. changed back to "create_time". Always enable profiling for DB queries. Fixed SiteController about Yii. changed to insert_time. Minor doc fix. refactored AutoTimestamp. Added UrlRule::host. ... Conflicts: yii/assets.php
Showing
File moved
apps/bootstrap/LICENSE.md
0 → 100644
apps/bootstrap/README.md
0 → 100644
apps/bootstrap/composer.json
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
File moved
File moved
File moved
File moved
File moved
File moved
File moved
yii/yiic
→
apps/bootstrap/yii
100755 → 100644
composer.lock
deleted
100644 → 0
upgrade.md
deleted
100644 → 0
yii/LICENSE.md
0 → 100644
yii/README.md
0 → 100644
yii/UPGRADE.md
0 → 100644
File moved
File moved
File moved
File moved
File moved
yii/base/Vector.php
deleted
100644 → 0
yii/logging/DebugTarget.php
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
yii/yiic.php
→
yii/yii
100644 → 100755
yii/yii.bat
0 → 100644
Please register or sign in to comment