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
..
helpers	Merge branch '1.3' into merger	2011-03-19 09:08:28 -04:00
helper.test.php	Moving the parseAttributes to Html helper.	2011-01-23 12:36:14 -02:00
helper_collection.test.php	Fixed aliasing so it works with plugins in the 'className' key	2011-01-14 17:44:33 -08:00
media.test.php	MediaView now forces download of unknown file types. Closes #140	2011-02-27 06:31:15 +05:30
theme.test.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
view.test.php	Fixing left over action from previos refactoring of viewClass/view.	2011-03-07 21:50:53 -05:00