mark_story 2afb05b590 Merge branch '2.0' into 2.1 ... Conflicts: app/View/Pages/home.ctp lib/Cake/Config/config.php lib/Cake/Core/App.php lib/Cake/VERSION.txt lib/Cake/View/Helper/NumberHelper.php		2012-02-12 10:06:13 -05:00
..
CacheHelper.php	Merge branch '2.0' into 2.1	2012-01-29 15:38:56 -05:00
FormHelper.php	Merge branch '2.0' into 2.1	2012-02-12 10:06:13 -05:00
HtmlHelper.php	Renaming option type to tag to avoid potential conflict in future with html attribute.	2012-02-10 19:44:55 +05:30
JqueryEngineHelper.php	Add/move docblocks to make text available in the API docs	2011-12-08 07:35:02 -08:00
JsBaseEngineHelper.php	Indentation fix (tab instead of spaces)	2011-12-20 22:26:43 -05:00
JsHelper.php	Fixing incorrect setting of default value for 'onDomReady' option in JsHelper::writeBuffer()	2011-12-08 14:03:39 +05:30
MootoolsEngineHelper.php	Add/move docblocks to make text available in the API docs	2011-12-08 07:35:02 -08:00
NumberHelper.php	Add missing options to NumberHelper docblocks	2012-02-10 22:17:58 -08:00
PaginatorHelper.php	Add option for 'current' class to PaginationHelper::numbers().	2012-01-28 18:24:28 +01:00
PrototypeEngineHelper.php	Add/move docblocks to make text available in the API docs	2011-12-08 07:35:02 -08:00
RssHelper.php	Add @link to docblocks on Form, Html, Js, Paginator, Rss and Session helpers	2011-11-29 21:23:02 -08:00
SessionHelper.php	Spelling and grammar fixes	2011-12-01 21:58:09 -08:00
TextHelper.php	moving methods from TextHelper to String	2012-02-10 22:25:59 +07:00
TimeHelper.php	moving TimeHelper to CakeTime	2012-02-10 22:25:59 +07:00