mark_story df5d9ac3d1 Merge branch '2.0' into 2.1 ... Conflicts: lib/Cake/Model/Model.php lib/Cake/Test/Case/Routing/RouterTest.php		2012-01-20 20:28:15 -05:00
..
Cache	Indentation fix (tab instead of spaces)	2011-12-20 22:26:43 -05:00
Config	Fix failing test in App.	2012-01-08 22:14:32 -05:00
Configure	Refactoring PhpReader::read() to check for .php file first. Fixed error when there's a directory with the same name.	2011-10-16 22:21:01 +02:00
Console	Merge branch '2.0' into 2.1	2012-01-20 20:28:15 -05:00
Controller	Merge branch '2.0' into 2.1	2012-01-20 20:28:15 -05:00
Core	Optimizing Configure::delete(), you can now delete arbitrarily nested keys	2012-01-14 23:30:31 -04:30
Error	Merge branch '2.0' into 2.1	2011-12-11 22:51:40 -05:00
Event	Fixing php 5.2 specific problem, closes #2468	2012-01-12 19:13:56 -04:30
I18n	Adding $language parameter to I18n::translate()	2012-01-10 00:51:48 +05:30
Log	Added visibility in some methods and attributes.	2011-08-18 22:30:28 -04:00
Model	Merge branch '2.0' into 2.1	2012-01-20 20:28:15 -05:00
Network	Merge branch '2.0' into 2.1	2012-01-20 20:28:15 -05:00
Routing	Merge branch '2.0' into 2.1	2012-01-20 20:28:15 -05:00
Test	Merge branch '2.0' into 2.1	2012-01-20 20:28:15 -05:00
TestSuite	Made default value and behavior of param $exceptions for Folder::tree() identical to same param in Folder::read()	2011-12-22 03:29:21 +05:30
Utility	Merge branch '2.0' into 2.1	2012-01-20 20:28:15 -05:00
View	Merge branch '2.0' into 2.1	2012-01-20 20:28:15 -05:00
basics.php	Fixing windows failing test case on the debug function	2012-01-07 01:39:40 -04:30
bootstrap.php	Code standards formatting	2011-12-15 22:52:07 -08:00
LICENSE.txt	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
VERSION.txt	Update version number to 2.1.0-alpha	2012-01-08 22:23:56 -05:00