mark_story b9f0fc0724 Merge branch '1.3' into merger ... Conflicts: cake/dispatcher.php cake/libs/cake_session.php cake/libs/controller/components/cookie.php cake/libs/controller/components/email.php cake/libs/controller/controller.php cake/libs/controller/scaffold.php cake/libs/set.php cake/libs/validation.php cake/libs/view/view.php cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/controller/components/security.test.php cake/tests/cases/libs/controller/controller.test.php cake/tests/cases/libs/validation.test.php cake/tests/cases/libs/view/view.test.php		2010-12-10 22:24:31 -05:00
..
coverage	Upgrading CodeCoverage repoting fo phpunit 3.5	2010-09-29 01:14:14 -04:30
reporter	Merge branch '1.3' into merger	2010-12-10 22:24:31 -05:00
templates	Removing =& operators for construction of objects.	2010-11-12 23:05:44 -05:00
cake_fixture_manager.php	Merge remote branch 'origin/2.0' into 2.0	2010-12-05 20:51:37 -04:30
cake_test_case.php	Fixing wrong assertion in test for CakeTestCase::testAction. Fixing testAction issue that would always include layout	2010-11-10 23:03:38 -04:30
cake_test_fixture.php	Removing forced trucation of tables in fixture loading, it was not really needed	2010-10-25 19:47:53 -04:30
cake_test_model.php	Fixing OpenTest license mentions to use MIT License	2010-10-03 12:31:21 -04:00
cake_test_suite.php	Replacing the use of removed "sharedFixture" and adding custom "fixtureManager" property to CakeTestCase	2010-09-27 23:37:56 -04:30
cake_test_suite_dispatcher.php	Merge branch '1.3' into integration	2010-10-31 21:56:59 -04:00
cake_web_test_case.php	Fixing OpenTest license mentions to use MIT License	2010-10-03 12:31:21 -04:00
test_manager.php	Replaced the *printf with i18n aliases by i18n aliases with params.	2010-12-04 23:37:13 -02:00
test_runner.php	Initial steps towards migrating to phpunit 3.5	2010-09-27 22:37:23 -04:30