Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2: (31 commits) Finished bootstrap Widget and Modal. PHP Intl extension has been added to default Yii requirements. moved optional packages to "suggest", updated platform requirements "vendor-dir": "vendor" is default, removed Fixes issue #320: Module::createController() will fail with a route with trailing slash. Fixed test break about AssetController. requirements css.php twitter bootstrap update to 2.3.2 Twitter bootstrap updated to 2.3.2 Modified the IAssetConvert interface. hashing the key for registerCss and registerJs. Update AccessRule.php refactored code after feedback Fixed framework path. Added support for View::POS_READY. new proposed structure remove from master (update track) minor fixes updated the README file of the bootstrap app. Inflector class readjusting files for the framework package. ...
Showing
File moved
apps/bootstrap/LICENSE.md
0 → 100644
apps/bootstrap/README.md
0 → 100644
File moved
apps/bootstrap/composer.json
0 → 100644
File moved
File moved
File moved
File moved
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
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
This diff is collapsed.
yii/bootstrap/Modal.php
0 → 100644
yii/bootstrap/Widget.php
0 → 100644
| ... | ... | @@ -63,36 +63,15 @@ |
| "irc": "irc://irc.freenode.net/yii", | ||
| "source": "https://github.com/yiisoft/yii2" | ||
| }, | ||
| "config": { | ||
| "vendor-dir": "yii/vendor" | ||
| }, | ||
| "bin": [ | ||
| "yii/yii" | ||
| ], | ||
| "repositories": [ | ||
| { | ||
| "type": "package", | ||
| "package": { | ||
| "name": "bestiejs/punycode.js", | ||
| "version": "1.2.1", | ||
| "dist": { | ||
| "url": "https://github.com/bestiejs/punycode.js/archive/1.2.1.zip", | ||
| "type": "zip" | ||
| }, | ||
| "source": { | ||
| "url": "https://github.com/bestiejs/punycode.js.git", | ||
| "type": "git", | ||
| "reference": "tags/1.2.1" | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "require": { | ||
| "php": ">=5.3.0", | ||
| "michelf/php-markdown": "1.3", | ||
| "twig/twig": "1.12.*", | ||
| "smarty/smarty": "3.1.*", | ||
| "ezyang/htmlpurifier": "v4.5.0", | ||
| "bestiejs/punycode.js": "1.2.1" | ||
| "php": ">=5.3.11", | ||
| "ext-mbstring": "*", | ||
| "lib-pcre": "*" | ||
| }, | ||
| "suggest": { | ||
| "michelf/php-markdown": "Required for Markdown helper.", | ||
| "twig/twig": "Required for TwigViewRenderer.", | ||
| "smarty/smarty": "Required for SmartyViewRenderer.", | ||
| "ezyang/htmlpurifier": "Required for Purifier helper." | ||
| } | ||
| } |
This diff is collapsed.
Please register or sign in to comment