Merge branch 'upstream' into 313-Inflector-Helper
* upstream: 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) made some changes, fix some pitfalls, remove PHP_EOL #20 proposed architecture for bootstrap Conflicts: yii/helpers/base/Inflector.php
Showing
apps/bootstrap/yii
100644 → 100755
yii/bootstrap/Modal.php
0 → 100644
yii/bootstrap/Widget.php
0 → 100644
This diff is collapsed.
Please register or sign in to comment