Commit graph

7 commits

Author SHA1 Message Date
mark_story
5717e3b59c Merge branch '1.2' into 1.2-merger
Conflicts:
	app/webroot/test.php
	cake/VERSION.txt
	cake/bootstrap.php
	cake/config/config.php
	cake/console/cake.php
	cake/console/libs/schema.php
	cake/console/templates/skel/webroot/test.php
	cake/libs/configure.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
mark_story
a499c980cd Removing webroot/js/vendors.php. These files are no longer needed as Dispatcher can handle serving js files from vendors directories. Adding empty files to empty directories. Refs #50 2009-09-13 23:32:27 -04:00
AD7six
d61e8736e4 Merge branch '1.3' into 1.3-bake 2009-08-02 22:44:28 +02:00
AD7six
7eb150b49a Merge branch '1.3' into 1.3-bake
Conflicts:
	cake/console/libs/tasks/model.php
2009-08-02 22:31:01 +02: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
phpnut
900d180ec9 Restructuring console directory
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5015 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-04 20:09:34 +00:00
phpnut
b32d55e28d Renaming scripts directory to better explain what it is for
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5013 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-04 20:05:34 +00:00