mark_story 4118477c0a Merge branch '1.3' into merger ... Conflicts: cake/console/templates/default/views/index.ctp cake/libs/cache.php cake/libs/cake_log.php cake/libs/cake_socket.php cake/libs/view/helpers/form.php cake/libs/view/helpers/js.php cake/tests/cases/libs/view/helpers/js.test.php cake/tests/lib/reporter/cake_cli_reporter.php		2011-03-19 09:08:28 -04:00
..
cache.test.php	Merge branch '1.3' into merger	2011-02-05 12:20:09 -05:00
form.test.php	Merge branch '1.3' into merger	2011-03-19 09:08:28 -04:00
html.test.php	Updating tests to account for attribute whitespace change.	2011-02-05 05:52:18 -05:00
jquery_engine.test.php	Fixing a few failing tests in helper tests.	2011-01-09 00:09:01 -05:00
js.test.php	Merge branch '1.3' into merger	2011-03-19 09:08:28 -04:00
mootools_engine.test.php	Fixing a few failing tests in helper tests.	2011-01-09 00:09:01 -05:00
number.test.php	Added more options to NumberHelper::currency() to allow for better flexibility in defining formats. Fixes #1267	2011-03-01 17:14:15 -08:00
paginator.test.php	Reordered PaginatorHelper::sort() key and title to be more consistent.	2011-01-02 18:44:41 -05:00
prototype_engine.test.php	Merge branch '1.3' into merger	2011-03-01 22:21:44 -05:00
rss.test.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
session.test.php	Adding the ability to pass additional information into the rendering of flash messages. Allows you to keep keep code DRY by moving repeated settings into the view.	2011-02-21 14:08:29 -05:00
text.test.php	Merge branch '1.3' into merger	2011-01-18 20:04:30 -05:00
time.test.php	Merge branch '1.3' into merger	2011-03-01 22:21:44 -05:00