mark
|
e16d21eaa3
|
Add displayField and primaryKey to controller bake. Fixes #1192
Signed-off-by: mark_story <mark@mark-story.com>
|
2011-02-12 11:47:38 -05:00 |
|
mark_story
|
e149c411fb
|
Merge branch '1.3' into merger
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/console/shells/tasks/template.php
cake/dispatcher.php
cake/libs/controller/component.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/helpers/cache.php
cake/libs/view/pages/home.ctp
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
cake/tests/fixtures/datatype_fixture.php
|
2011-02-05 12:20:09 -05:00 |
|
Juan Basso
|
6181db0ff2
|
Removing unsupported databases natively.
|
2011-01-19 00:06:51 -02:00 |
|
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
|
2385d9c79a
|
Updating console class @package tags.
|
2010-12-24 14:26:26 -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
|
f84871ae47
|
Fixing strict errors that were causing shell tests to fail.
Fixing test case for bake test that has been getting skipped.
|
2010-12-12 20:55:33 -05:00 |
|
mark_story
|
c096eea664
|
Fixing failing tests caused by constants changing.
|
2010-12-05 23:32:34 -05:00 |
|
José Lorenzo Rodríguez
|
c559b9c22d
|
Merge remote branch 'origin/2.0' into 2.0
Conflicts:
cake/console/templates/skel/config/database.php.default
cake/libs/model/datasources/dbo/dbo_sqlite.php
|
2010-12-05 20:51:37 -04:30 |
|
Juan Basso
|
c52d5320c8
|
Replaced the *printf with i18n aliases by i18n aliases with params.
|
2010-12-04 23:37:13 -02:00 |
|
José Lorenzo Rodríguez
|
b6731dd9ad
|
Merge remote branch 'origin/2.0' into feature/2.0/pdo
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
|
2010-11-26 20:26:41 -04:30 |
|
mark_story
|
d7b1f70680
|
Adding some additional output to bake tasks to make them more consistent. Adding flags for Quiet output so the shells give minimal output.
|
2010-11-21 12:55:01 -05:00 |
|
José Lorenzo Rodríguez
|
f2b707ac0b
|
Merge remote branch 'origin/2.0' into feature/2.0/pdo
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
|
2010-11-16 21:54:42 -04:30 |
|
mark_story
|
9b08b725fe
|
Merge branch '2.0' into 2.0-view
Conflicts:
cake/libs/controller/controller.php
cake/libs/view/helpers/cache.php
|
2010-11-13 21:03:54 -05:00 |
|
mark_story
|
18bb5f6b8b
|
Removing =& operators for construction of objects.
|
2010-11-12 23:05:44 -05:00 |
|
mark_story
|
23c69b2bfb
|
Adding an import, as I hit an error when trying to bake tests for models.
|
2010-11-07 13:23:43 -05:00 |
|
José Lorenzo Rodríguez
|
eedd823fd8
|
Merge remote branch 'origin/2.0' into feature/2.0/pdo
|
2010-11-03 00:23:18 -04:30 |
|
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
|
c9ca3c3785
|
Fixing path constants in DbConfig and FixtureTask to be more consistent between web and cli.
|
2010-11-02 23:25:36 -04:00 |
|
mark_story
|
fff8279c2b
|
Using patch from 'wals' to add generic exclude option to the ExtractTask. Allows you to exclude path segments from the generated PO files.
Fixes #1138
|
2010-10-29 00:40:04 -04:00 |
|
mark_story
|
0a022f1d81
|
Updating tasks to not rely on the dispatcher being available.
|
2010-10-24 15:27:44 -04:00 |
|
mark_story
|
c8b0267588
|
Making project task and bake play nice with creating a new project.
|
2010-10-23 00:35:53 -04:00 |
|
mark_story
|
1b5cc91262
|
Reformatting default values.
Fixing issue with undefined variables caused by missing extract().
|
2010-10-23 00:35:30 -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
|
6900f470ad
|
Moving code from BakeShell to BakeTask.
Adding a base execute method to contain common code shared amongst all the bake tasks.
Updating test cases as $name attributes value has changed.
|
2010-10-18 23:09:23 -04:00 |
|
mark_story
|
de615967fc
|
Removing dead code from the PluginTask.
|
2010-10-18 22:38:17 -04:00 |
|
mark_story
|
01b1fb8638
|
Removing the old help method.
|
2010-10-17 23:31:58 -04:00 |
|
mark_story
|
529527a722
|
Removing ability of plugin task to pass through to a few but not all parts of bake.
Adding OptionParser definition.
|
2010-10-17 23:09:30 -04:00 |
|
mark_story
|
1d974f5a48
|
Fixing issue that caused db config generation to fail.
|
2010-10-17 22:54:07 -04:00 |
|
mark_story
|
ae9403601e
|
Making the project task correctly replace the __CAKE_PATH__ constant when creating new projects.
|
2010-10-17 22:38:32 -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
|
db6149a5e8
|
Adding some more colour to the project task.
Making regular expressions easier to read.
|
2010-10-17 19:08:08 -04:00 |
|
mark_story
|
53a1663b96
|
Adding console dir to skel.
Updating project task to test for directories and files in a more readable way.
|
2010-10-17 19:01:44 -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 |
|
mark_story
|
a76ce4af3d
|
Renaming console/libs to console/shells so its more consistent with app directories.
|
2010-10-17 15:07:00 -04:00 |
|