cakephp2-php8/lib/Cake/Model
Ceeram 2897c72215 AclNode now extends Model, to avoid infinite loop when attaching AclBehavior to AppModel
Conflicts:

	lib/Cake/Model/AclNode.php
	lib/Cake/Model/Aco.php
	lib/Cake/Model/Aro.php
2012-02-10 23:38:40 +01:00
..
Behavior Split I18nModel into a separate file. 2012-01-29 13:28:08 -05:00
Datasource Add params option to logQuery() 2012-02-08 20:15:40 -05:00
AclNode.php AclNode now extends Model, to avoid infinite loop when attaching AclBehavior to AppModel 2012-02-10 23:38:40 +01:00
Aco.php AclNode now extends Model, to avoid infinite loop when attaching AclBehavior to AppModel 2012-02-10 23:38:40 +01:00
AcoAction.php Add/move docblocks to make text available in the API docs 2011-12-08 07:35:02 -08:00
Aro.php AclNode now extends Model, to avoid infinite loop when attaching AclBehavior to AppModel 2012-02-10 23:38:40 +01:00
BehaviorCollection.php Merge branch '2.0' into 2.1 2012-01-08 21:59:18 -05:00
CakeSchema.php Merge branch '2.0' into 2.1 2011-12-11 22:51:40 -05:00
ConnectionManager.php Add/move docblocks to make text available in the API docs 2011-12-08 07:35:02 -08:00
I18nModel.php Split I18nModel into a separate file. 2012-01-29 13:28:08 -05:00
Model.php Merge branch '2.0' into 2.1 2012-01-26 21:40:18 +01:00
ModelBehavior.php fixing typos 2011-10-19 12:19:28 +07:00
Permission.php Add/move docblocks to make text available in the API docs 2011-12-08 07:35:02 -08:00