cakephp2-php8/lib/Cake
mark_story 7b5e45b965 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Model/Datasource/DataSource.php
	lib/Cake/VERSION.txt
2012-05-03 21:06:35 -04:00
..
Cache Another micro-optimization, sorry 2012-04-23 23:42:57 -04:30
Config Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Configure Add more tests 2012-05-01 21:43:01 -04:00
Console Remove duplicate template. 2012-05-02 20:54:50 -04:00
Controller Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Core Update dump() to allow partial dumps. 2012-05-01 21:00:42 -04:00
Error Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Event Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
I18n Merge branch '2.2-hash' into 2.2 2012-04-10 21:32:37 -04:00
Log Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Model Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Network Allow bulk storing/updating of mime types. Closes #2844 2012-05-03 01:39:12 +05:30
Routing Merge branch '2.1' into 2.2 2012-04-26 22:27:44 -04:00
Test Merge branch '2.1' into 2.2 2012-05-03 21:06:35 -04:00
TestSuite Merge branch '2.1' into 2.2 2012-05-03 21:06:35 -04:00
Utility Merge branch '2.1' into 2.2 2012-05-03 21:06:35 -04:00
View Fix more coding standards errors. 2012-04-23 22:27:27 -04:00
basics.php Adding file lock when use cache function. It will avoid errors when view cache is created by 2 threads concurrently. 2012-04-21 21:01:58 -04:00
bootstrap.php Move where set is loaded. 2012-04-10 21:25:04 -04:00
LICENSE.txt Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
VERSION.txt Update version number to 2.1.2 2012-04-29 21:07:12 -04:30