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
|
4cebe55a9b
|
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
Conflicts:
app/webroot/index.php
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Network/CakeRequest.php
lib/Cake/tests/cases/libs/controller/components/auth.test.php
|
2011-02-21 22:28:30 -04:30 |
|
José Lorenzo Rodríguez
|
f8b51bfd92
|
Making the test suite load again
|
2011-02-13 23:56:41 -04:30 |
|
José Lorenzo Rodríguez
|
1b38d7c851
|
Resolving conflict left out in previous commit
|
2011-02-13 23:42:41 -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
|
1332561164
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/libs/view/helpers/js.php
lib/Cake/Console/Command/Task/FixtureTask.php
|
2011-01-09 23:32:05 -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
|
b2ad8fe113
|
Removing constant TEST_CAKE_CORE_INCLUDE_PATH
|
2010-12-19 23:33:37 -04:30 |
|
José Lorenzo Rodríguez
|
5fa028839e
|
Fixing paths location in cake.php files
|
2010-12-19 23:17:53 -04:30 |
|
José Lorenzo Rodríguez
|
8bcabdea6a
|
Fixing constants for test suite
|
2010-12-18 22:02:25 -04:30 |
|
José Lorenzo Rodríguez
|
07e43bb0f8
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/form.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
cake/tests/test_app/views/posts/scaffold.edit.ctp
cake/tests/test_app/views/posts/scaffold.form.ctp
lib/Cake/Error/ErrorHandler.php
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/Datasource/CakeSession.php
lib/Cake/Routing/Router.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/View/scaffolds/edit.ctp
lib/Cake/tests/cases/console/shells/bake.test.php
lib/Cake/tests/cases/libs/cake_log.test.php
lib/Cake/tests/cases/libs/cake_request.test.php
lib/Cake/tests/cases/libs/view/helpers/number.test.php
lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
|
2010-12-15 01:13:05 -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
|
848461f7a0
|
Making the testsuite run again
|
2010-12-08 01:49:36 -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
|
66145db2a9
|
Fixing class loading for bake tasks
|
2010-12-07 19:50:56 -04:30 |
|
José Lorenzo Rodríguez
|
b5122e6e81
|
Fixing more console classes
|
2010-12-07 01:44:47 -04:30 |
|
José Lorenzo Rodríguez
|
e3690ebccb
|
Making shells run again
|
2010-12-07 01:26:10 -04:30 |
|
José Lorenzo Rodríguez
|
1c0a4c9e0a
|
Starting to move console classes
|
2010-12-07 00:47:53 -04:30 |
|