cakephp2-php8/cake/libs/model
mark_story 326424592d Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/libs/inflector.php
	cake/libs/view/view.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
..
behaviors Merge branch '1.3-misc' into 1.3 2009-08-02 12:20:07 -07:00
datasources Merge branch '1.2' into 1.2-merger 2009-09-13 13:52:58 -04:00
app_model.php adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
cake_schema.php whitespace normalization 2009-08-02 16:10:24 -07:00
connection_manager.php adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
db_acl.php adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
model.php Changes Model::find() to allow modification of DataSource connection during callbacks. 2009-09-10 09:28:55 -04:00
model_behavior.php Fixing issues with cakeError call. 2009-08-30 19:33:21 -04:00