Mark Story adf604a966 Merge branch '1.3' into 2.0 ... Conflicts: cake/console/templates/default/actions/controller_actions.ctp cake/console/templates/default/views/form.ctp cake/console/templates/default/views/index.ctp cake/console/templates/default/views/view.ctp cake/libs/controller/controller.php cake/libs/controller/scaffold.php cake/libs/view/pages/home.ctp cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/model/cake_schema.test.php		2010-05-02 17:53:42 -04:00
..
app_helper.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
cache.php	Merge remote branch 'origin/1.3' into 2.0	2010-04-06 12:19:34 +10:00
form.php	Merge branch '1.3' into 2.0	2010-05-02 17:53:42 -04:00
html.php	Merge remote branch 'origin/1.3' into 2.0	2010-04-09 22:05:00 +10:00
jquery_engine.php	Changed all public methods to specify public access.	2010-04-05 13:19:38 +10:00
js.php	Merge branch '1.3' into 2.0	2010-05-02 17:53:42 -04:00
mootools_engine.php	Converted views, router and security classes to new translation shotcut function use.	2010-04-16 02:20:15 +10:00
number.php	Converted views, router and security classes to new translation shotcut function use.	2010-04-16 02:20:15 +10:00
paginator.php	Fixing failing tests in PaginatorHelper and moving tests related to JsHelper interaction into a separate test method.	2010-04-23 21:10:23 -04:00
prototype_engine.php	Changed all public methods to specify public access.	2010-04-05 13:19:38 +10:00
rss.php	Merge remote branch 'origin/1.3' into 2.0	2010-04-06 12:19:34 +10:00
session.php	Converted views, router and security classes to new translation shotcut function use.	2010-04-16 02:20:15 +10:00
text.php	Merge remote branch 'origin/1.3' into 2.0	2010-04-16 23:43:28 +10:00
time.php	Converted views, router and security classes to new translation shotcut function use.	2010-04-16 02:20:15 +10:00
xml.php	Merge remote branch 'origin/1.3' into 2.0	2010-04-23 12:52:56 +10:00