Mark Story
|
08e7bcb7ab
|
Merge branch '1.3' into integration
Conflicts:
app/config/core.php
cake/console/libs/acl.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/webroot/test.php
cake/dispatcher.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/log/file_log.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/lib/reporter/cake_cli_reporter.php
|
2010-10-31 21:56:59 -04:00 |
|
Graham Weldon
|
d3e0ddbb0e
|
Update copyright years.
|
2010-10-25 07:58:22 +11:00 |
|
mark_story
|
f847080cbf
|
Changing more php version strings.
|
2010-10-03 12:46:03 -04:00 |
|
mark_story
|
999a878d68
|
Removing closing ?> on bake templates so they match the rest of CakePHP.
|
2010-07-01 18:19:37 -04:00 |
|
predominant
|
4c93fc9e52
|
Uopdate default bake template to assign public to functions and variables.
|
2010-04-04 16:46:01 +10:00 |
|
Mark Story
|
cdd87849cc
|
Fixing @link tags to ease merging.
|
2010-01-26 17:03:03 -05:00 |
|
ADmad
|
e2c4c0d4de
|
Removed adding of Html and Form helper by default to baked controllers as its not DRY and they are alrady inherited from Controller class. If var helpers is declared in AppController, Html and Form should be included there.
|
2009-12-08 01:41:52 +05:30 |
|
predominant
|
1185681549
|
Removing newline caused by Subversion line removal.
|
2009-11-06 18:01:22 +11:00 |
|
mark_story
|
9092b25004
|
Fixing how scaffold arg works, now generates scaffolds.
Making admin arg only make admin methods and new both arg make both admin and non admin methods.
Adding test cases.
Adding new line to template.
|
2009-07-28 22:53:29 -04:00 |
|
mark_story
|
b4f4aeeec7
|
Moving shell templates dirs.
Updating TemplateTask to reflect changes in directories.
Updating test cases to use App::build()/App::path()
|
2009-07-26 01:29:08 -04:00 |
|