AD7six
|
38180e8951
|
translation changes in the model dir
|
2011-03-12 20:01:12 +01:00 |
|
Jose Lorenzo Rodriguez
|
ba694c45c9
|
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
|
2011-02-27 22:50:53 -04:30 |
|
José Lorenzo Rodríguez
|
b314149efd
|
Checkin that PluginAppModel is not in the list of modles to be used for CakeSchema
|
2011-02-21 23:28:00 -04:30 |
|
José Lorenzo Rodríguez
|
6e4f4efb79
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/bootstrap.php
lib/Cake/Console/Command/TestSuiteShell.php
lib/Cake/Console/TaskCollection.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Controller/Controller.php
lib/Cake/Core/App.php
lib/Cake/Model/BehaviorCollection.php
lib/Cake/Network/CakeRequest.php
lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
lib/Cake/TestSuite/CakeWebTestCase.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/TestSuite/TestRunner.php
lib/Cake/View/HelperCollection.php
lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
lib/Cake/tests/cases/libs/test_manager.test.php
|
2011-02-13 23:10:19 -04:30 |
|
José Lorenzo Rodríguez
|
d9c99b5ef6
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/tests/cases/libs/controller_test_case.test.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/View/pages/home.ctp
|
2011-01-22 01:00:15 -04:30 |
|
José Lorenzo Rodríguez
|
cd28f19363
|
Making CakeSchema tests pass
|
2011-01-08 23:45:07 -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
|
b8344ecd33
|
Replacing some of the App::import by App::uses
|
2010-12-08 23:15:18 -04:30 |
|
José Lorenzo Rodríguez
|
02ad049559
|
Fixing more shells, and updating code in home.ctp
|
2010-12-07 20:42:50 -04:30 |
|
José Lorenzo Rodríguez
|
5dddb362ec
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
lib/Cake/config/ini_file.php
|
2010-12-06 09:42:52 -04:30 |
|
José Lorenzo Rodríguez
|
3f64844de9
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
lib/Cake/Model/ConnectionManager.php
lib/Cake/basics.php
|
2010-12-05 23:43:58 -04:30 |
|
José Lorenzo Rodríguez
|
2fed702c57
|
Moving more model classes to the new package
|
2010-12-05 15:00:02 -04:30 |
|