mark_story d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in ... Conflicts: cake/console/libs/shell.php cake/libs/model/connection_manager.php cake/libs/view/helpers/html.php cake/libs/view/helpers/javascript.php cake/tests/cases/libs/i18n.test.php cake/tests/cases/libs/model/connection_manager.test.php cake/tests/cases/libs/model/model_read.test.php cake/tests/cases/libs/view/helpers/html.test.php cake/tests/groups/database.group.php		2009-10-14 00:51:55 -04:00
..
cache_empty_sections.ctp	adding failing testcase for identical <cake:nocache> content confussion.	2008-10-05 18:27:02 +00:00
index.ctp	Moving Cake folder to correct location	2008-05-30 11:40:08 +00:00
multiple_nocache.ctp	Fixing CacheHelper and multiple cake:nocache tags in a view file, breaking cake:nocache following $content_for_layout. Fixes #136	2009-10-01 01:03:47 -04:00
nocache_multiple_element.ctp	Setting missing props on files	2008-09-09 18:51:28 +00:00
scaffold.edit.ctp	Correcting scaffold view file implementation. Was incorrectly using separate add and edit templates. Changes bring scaffold templates more inline with bake templates.	2008-09-27 03:48:23 +00:00
sequencial_nocache.ctp	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
test_nocache_tags.ctp	Merge branch '1.3-misc' into 1.3	2009-08-02 12:20:07 -07:00