Jose Lorenzo Rodriguez
|
2a39e6869c
|
Merge branch '2.0' into 2.0-merge
Conflicts:
lib/Cake/Test/Case/Controller/ScaffoldTest.php
lib/Cake/Test/Case/Model/ConnectionManagerTest.php
lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
lib/Cake/Test/Case/Utility/SanitizeTest.php
|
2011-06-17 18:04:03 -04:30 |
|
ADmad
|
ccc3b9dbb4
|
Updating docblock for Sanitize::stripScripts()
|
2011-06-05 03:19:12 +05:30 |
|
Juan Basso
|
192812ee7f
|
Updating the copyright to 2011.
|
2011-05-30 22:32:43 -04:00 |
|
Jose Lorenzo Rodriguez
|
ad456bd479
|
Removing code that should not have existed in the first place
|
2011-05-27 01:42:03 -04:30 |
|
Jose Lorenzo Rodriguez
|
07b84a71ab
|
Removing unneeded assignments by reference
|
2011-04-29 11:49:46 -04:30 |
|
Jose Lorenzo Rodriguez
|
000e05b468
|
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/libs/view/helpers/js.php
cake/tests/lib/templates/missing_conenction.php
cake/tests/lib/templates/missing_connection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/templates/missing_conenction.php
lib/Cake/View/Helper/FormHelper.php
lib/Cake/tests/Case/Core/ConfigureTest.php
|
2011-04-11 22:48:08 -04:30 |
|
José Lorenzo Rodríguez
|
4c0e06c451
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
|
2011-01-02 02:00:03 -04:30 |
|
José Lorenzo Rodríguez
|
b19b25a788
|
Moving some spare clases to the corresponding packages
|
2010-12-05 13:21:28 -04:30 |
|