Commit graph

7 commits

Author SHA1 Message Date
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
mark_story
c19c1a7828 Fixing issues with cakeError call.
Adding tests for cakeError being called with non-existant Behaviors.
2009-08-30 19:33:21 -04:00
gwoo
6775e0997e Merge branch '1.2' into 1.3 2009-08-03 13:13:18 -07:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
gwoo
a2f0ab8b27 Merge branch '1.2' into 1.3 2009-07-20 09:31:56 -07:00
gwoo
6f21c18366 Merge branch '1.3-lib_renames' into 1.3 2009-06-02 10:17:02 -07:00
jperras
e651c77bcf Renaming behavior.php to model_behavior.php. Modifying associated App::import calls. 2009-03-15 21:17:08 -04:00
Renamed from cake/tests/cases/libs/model/behavior.test.php (Browse further)