Antonio Ramirez 8101b5ed88 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

2013-05-20 17:40:25 +02:00

..

base

Inflector second revision

2013-05-20 00:38:25 +02:00

ArrayHelper.php

Moved "framework" to "iii".

2013-05-09 12:00:15 -04:00

Console.php

Moved "framework" to "iii".

2013-05-09 12:00:15 -04:00

FileHelper.php

Moved "framework" to "iii".

2013-05-09 12:00:15 -04:00

Html.php

Moved "framework" to "iii".

2013-05-09 12:00:15 -04:00

Json.php

Moved "framework" to "iii".

2013-05-09 12:00:15 -04:00

Markdown.php

Moved "framework" to "iii".

2013-05-09 12:00:15 -04:00

Purifier.php

Moved "framework" to "iii".

2013-05-09 12:00:15 -04:00

SecurityHelper.php

Moved "framework" to "iii".

2013-05-09 12:00:15 -04:00

StringHelper.php

Moved "framework" to "iii".

2013-05-09 12:00:15 -04:00

VarDumper.php

Moved "framework" to "iii".

2013-05-09 12:00:15 -04:00