Jose Lorenzo Rodriguez d83555cc52 Merge remote-tracking branch 'origin/1.3' into merger ... Conflicts: cake/console/cake.php cake/dispatcher.php cake/libs/controller/components/auth.php cake/libs/controller/controller.php cake/libs/view/helpers/xml.php cake/libs/view/pages/home.ctp cake/libs/xml.php cake/tests/cases/console/cake.test.php cake/tests/cases/libs/controller/components/cookie.test.php cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php cake/tests/cases/libs/model/datasources/dbo_source.test.php cake/tests/cases/libs/view/helpers/xml.test.php cake/tests/cases/libs/xml.test.php lib/Cake/Console/Command/SchemaShell.php lib/Cake/Controller/Component/CookieComponent.php lib/Cake/Network/Http/HttpSocket.php lib/Cake/TestSuite/Fixture/CakeTestFixture.php lib/Cake/VERSION.txt lib/Cake/View/Helper/FormHelper.php lib/Cake/View/Helper/TextHelper.php lib/Cake/View/Helper/TimeHelper.php lib/Cake/config/config.php lib/Cake/tests/Case/Cache/CacheTest.php lib/Cake/tests/Case/Model/CakeSchemaTest.php lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php		2011-05-04 01:10:23 -04:30
..
AppHelper.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
CacheHelper.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-03-05 17:37:31 -04:30
FormHelper.php	Merge remote-tracking branch 'origin/1.3' into merger	2011-05-04 01:10:23 -04:30
HtmlHelper.php	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
JqueryEngineHelper.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-03-01 23:04:52 -04:30
JsBaseEngineHelper.php	Removed JsBaseEngineHelper::$useNative. Removed json_encode() emulation from JsBaseEngineHelper::object(). Removed unnessecary call to get_object_vars() in JsBaseEngineHelper::object(). Removed unnessecary tests for equalness of emulation and native json_encode(). Added test for correct encoding of objects to JsHelper test case. Fixes #704	2011-04-26 22:35:33 -04:00
JsHelper.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-04-11 22:48:08 -04:30
MootoolsEngineHelper.php	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
NumberHelper.php	update language domains	2011-03-19 18:29:31 +01:00
PaginatorHelper.php	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
PrototypeEngineHelper.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-03-01 23:04:52 -04:30
RssHelper.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
SessionHelper.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-02-21 22:28:30 -04:30
TextHelper.php	Merge remote-tracking branch 'origin/1.3' into merger	2011-05-04 01:10:23 -04:30
TimeHelper.php	Merge remote-tracking branch 'origin/1.3' into merger	2011-05-04 01:10:23 -04:30