mark_story 9a8ceaeba6 Merge branch '2.1' into 2.2 ... Conflicts: lib/Cake/Test/Case/View/XmlViewTest.php		2012-05-30 21:20:56 -04:00
..
Behavior	Merge branch '2.1' into 2.2	2012-05-30 21:20:56 -04:00
Datasource	Add test for belongsTo and hasOne optimization.	2012-05-27 23:16:20 +02:00
Validator	Fix some minor code style issues.	2012-05-27 14:20:19 -04:00
AclNodeTest.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
BehaviorCollectionTest.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
CakeSchemaTest.php	Fixing CakeSchema to test APP_DIR with different names than all lowercase	2012-05-15 21:41:11 +01:00
ConnectionManagerTest.php	Update 1.x @link in docblocks	2012-04-26 19:49:18 -07:00
ModelCrossSchemaHabtmTest.php	Merge remote-tracking branch 'origin/2.1' into 2.2	2012-04-29 20:05:39 -04:30
ModelDeleteTest.php	Update 1.x @link in docblocks	2012-04-26 19:49:18 -07:00
ModelIntegrationTest.php	Merge remote-tracking branch 'origin/2.1' into 2.2	2012-04-29 20:05:39 -04:30
ModelReadTest.php	Merge branch '2.1' into 2.2	2012-05-20 14:53:41 -04:00
models.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
ModelTest.php	Fix coding standards.	2012-05-20 15:51:09 -04:00
ModelTestBase.php	Update 1.x @link in docblocks	2012-04-26 19:49:18 -07:00
ModelValidationTest.php	Fixed failing test case	2012-05-30 15:26:59 -07:00
ModelWriteTest.php	Fix some minor code style issues.	2012-05-27 14:20:19 -04:00