Mark Story 6a3347ef7c Merge remote branch 'origin/1.2' into 1.2-merger ... Conflicts: cake/VERSION.txt cake/config/config.php cake/console/libs/tasks/model.php cake/dispatcher.php cake/libs/l10n.php cake/libs/model/datasources/dbo_source.php cake/libs/view/pages/home.ctp cake/tests/cases/console/libs/tasks/model.test.php cake/tests/cases/libs/view/helpers/ajax.test.php cake/tests/cases/libs/view/helpers/text.test.php		2010-02-20 01:32:04 -05:00
..
ajax.php	Merge remote branch 'origin/1.2' into 1.2-merger	2010-02-20 01:32:04 -05:00
app_helper.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
cache.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
form.php	Clarifying the behaviour of FormHelper::button() fixes #335	2010-02-12 23:58:35 -05:00
html.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
javascript.php	Adding test to check that postfix and prefix options don't go into inner objects. Tests added, fixes #348	2010-02-17 22:22:53 -05:00
jquery_engine.php	Fixing issues in JqueryEngineHelper where eval()'ed responses wouldn't run code contained inside $js->domReady() due to implementation differences between $(document).ready() and $(document).bind('ready'). Tests updated.	2010-01-29 10:06:47 -05:00
js.php	Applying fixes made to JavascriptHelper to JsBaseEngine.	2010-02-17 22:27:52 -05:00
mootools_engine.php	Standardising docblock endings throughout.	2009-11-14 23:19:25 +11:00
number.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
paginator.php	Fixing formatting of code.	2010-02-09 21:05:01 -05:00
prototype_engine.php	Updating doc blocks for the helpers. Unifying formatting and adding missing @access tags and fixing various formatting differences.	2010-01-25 17:59:05 -05:00
rss.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
session.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
text.php	Merge remote branch 'origin/1.2' into 1.2-merger	2010-02-20 01:32:04 -05:00
time.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
xml.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00