Commit graph

12 commits

Author SHA1 Message Date
Juan Basso
6002f10b3b Generating PHPDoc to baked files. 2011-01-19 22:22:50 -02:00
Juan Basso
40bdcbb44a Removing $name from controller, model and fixtures. 2011-01-19 21:15:33 -02:00
mark_story
dca3fecfed Merge branch '1.3' into merger
Conflicts:
	cake/console/error.php
	cake/libs/cache/memcache.php
	cake/libs/cake_session.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/cake_schema.php
	cake/libs/router.php
	cake/libs/set.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/text.php
	cake/libs/view/view.php
	cake/tests/cases/libs/set.test.php
2011-01-18 20:04:30 -05:00
mark_story
f893e3b63b Applying patch from 'ryandesign' fixing incorrect datetime formats. Fixes #1441 2011-01-11 20:16:42 -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
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
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
Renamed from cake/console/libs/templates/default/classes/fixture.ctp (Browse further)