cakephp2-php8/cake/tests/cases/libs/model
mark_story 929bb5769e Merge branch '1.3' into 2.0
Conflicts:
	app/webroot/index.php
	cake/console/templates/skel/webroot/index.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/model_behavior.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
..
behaviors Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
datasources Merge branch '1.3' into 2.0 2010-06-26 12:29:20 -04:00
cake_schema.test.php Merge branch '1.3' into 2.0 2010-06-26 12:29:20 -04:00
connection_manager.test.php Naming conventions to datasources with plugins. Fixes #819 2010-06-20 23:53:54 -03:00
db_acl.test.php Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
model.test.php Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
model_behavior.test.php Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
model_delete.test.php Update various links. Closes #392 2010-05-18 22:15:13 -03:00
model_integration.test.php Update various links. Closes #392 2010-05-18 22:15:13 -03:00
model_read.test.php Merge branch '1.3' into 2.0 2010-06-26 12:29:20 -04:00
model_validation.test.php Update various links. Closes #392 2010-05-18 22:15:13 -03:00
model_write.test.php Merge branch '1.3' into 2.0 2010-06-26 12:29:20 -04:00
models.php Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00