Merge upstream/master into upstream/mssql.
Showing
apps/bootstrap/LICENSE.md
0 → 100644
apps/bootstrap/README.md
0 → 100644
apps/bootstrap/composer.json
0 → 100644
This diff is collapsed.
This diff is collapsed.
File moved
File moved
File moved
File moved
File moved
File moved
apps/bootstrap/yii
0 → 100755
composer.lock
deleted
100644 → 0
framework/LICENSE.md
0 → 100644
framework/README.md
0 → 100644
framework/UPGRADE.md
0 → 100644
| ... | ... | @@ -63,17 +63,18 @@ |
| "irc": "irc://irc.freenode.net/yii", | ||
| "source": "https://github.com/yiisoft/yii2" | ||
| }, | ||
| "config": { | ||
| "vendor-dir": "yii/vendor" | ||
| }, | ||
| "bin": [ | ||
| "yii/yiic" | ||
| ], | ||
| "require": { | ||
| "php": ">=5.3.0", | ||
| "michelf/php-markdown": "1.3", | ||
| "twig/twig": "1.12.*", | ||
| "smarty/smarty": "3.1.*", | ||
| "ezyang/htmlpurifier": "v4.5.0" | ||
| "php": ">=5.3.11", | ||
| "ext-mbstring": "*", | ||
| "lib-pcre": "*" | ||
| }, | ||
| "autoload": { | ||
| "psr-0": { "yii\\": "/" } | ||
| }, | ||
| "suggest": { | ||
| "michelf/php-markdown": "Required for Markdown helper.", | ||
| "twig/twig": "Required for TwigViewRenderer.", | ||
| "smarty/smarty": "Required for SmartyViewRenderer.", | ||
| "ezyang/htmlpurifier": "Required for Purifier helper." | ||
| } | ||
| } |
framework/yii/.gitignore
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
File moved
This diff is collapsed.
File moved
This diff is collapsed.
File moved
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
File moved
This diff is collapsed.
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
This diff is collapsed.
File moved
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
yii/yiic.php
→
framework/yii/yii
100644 → 100755
This diff is collapsed.
framework/yii/yii.bat
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
upgrade.md
deleted
100644 → 0
This diff is collapsed.
yii/.htaccess
deleted
100644 → 0
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
yii/base/Vector.php
deleted
100644 → 0
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
yii/yiic
deleted
100755 → 0
This diff is collapsed.
Please register or sign in to comment