cakephp2-php8/cake/libs/model
Mark Story 6a3347ef7c Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/console/libs/tasks/model.php
	cake/dispatcher.php
	cake/libs/l10n.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
2010-02-20 01:32:04 -05:00
..
behaviors Merge remote branch 'origin/1.2' into 1.2-merger 2010-02-20 01:32:04 -05:00
datasources Merge remote branch 'origin/1.2' into 1.2-merger 2010-02-20 01:32:04 -05:00
app_model.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
cake_schema.php Not forcing the use of ds, so will use $useDbConfig instead, tests added. Fixes #324. 2010-02-15 14:46:18 -03:00
connection_manager.php Minor refactor of ConnectionManager::__connectionData(). Uses pluginSplit() now to consolidate plugin dot notation handling. 2010-02-16 22:42:06 -05:00
db_acl.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
model.php Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-02-02 20:39:25 -05:00
model_behavior.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00