mark_story
|
443f6d1c5b
|
Merge branch '1.3' into merger
Conflicts:
cake/console/shells/tasks/test.php
cake/libs/cake_log.php
cake/libs/controller/components/email.php
cake/libs/set.php
cake/libs/view/helpers/cache.php
cake/libs/view/helpers/paginator.php
cake/libs/view/helpers/time.php
cake/libs/view/view.php
cake/tests/cases/console/libs/tasks/fixture.test.php
cake/tests/cases/console/shells/tasks/test.test.php
cake/tests/cases/libs/controller/components/email.test.php
cake/tests/cases/libs/model/db_acl.test.php
cake/tests/cases/libs/set.test.php
|
2011-01-08 23:49:19 -05:00 |
|
mark_story
|
ef77e60cb0
|
Removing @subpackage tags, moving contents of @subpackage into @package.
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
|
2010-12-24 14:09:57 -05:00 |
|
mark_story
|
bff711e2dc
|
Merge branch '2.0-console' into 2.0
Conflicts:
cake/console/shells/acl.php
cake/tests/cases/console/libs/tasks/plugin.test.php
|
2010-11-02 23:49:19 -04:00 |
|
mark_story
|
c169de60e2
|
Updating tasks to not take ShellDispatcher as a parameter.
|
2010-10-24 15:27:04 -04:00 |
|
mark_story
|
cf9166a689
|
Starting to remove Dispatch->params in favor of the constants ShellDispatcher makes, this will make removing the dependency from Shell much easier.
|
2010-10-23 00:11:31 -04:00 |
|
mark_story
|
e807cc0eca
|
Removing a bunch of dead properties from ShellDispatcher and Shell.
They are no longer needed/used.
Moving Shell back to console/shells so App::import() can easily find it.
|
2010-10-17 21:04:14 -04:00 |
|
mark_story
|
8c63f155ba
|
Renaming + moving test and task files around. Updating tests to use import for tasks.
|
2010-10-17 15:43:20 -04:00 |
|