mark_story
|
4d37e75f18
|
Merge branch '1.2' into 1.3-merger
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/controller/components/cookie.php
cake/libs/debugger.php
cake/libs/flay.php
cake/libs/http_socket.php
cake/libs/inflector.php
cake/libs/model/cake_schema.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo_source.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/js.php
|
2009-11-22 20:38:50 -05:00 |
|
predominant
|
384bb7a0e0
|
Update license lines throughout.
|
2009-11-06 17:51:51 +11:00 |
|
predominant
|
d7b604c8ed
|
Fixing links throughout
|
2009-11-06 17:46:59 +11:00 |
|
predominant
|
8ff6505fe8
|
Removing excess whitespace
|
2009-11-06 17:08:23 +11:00 |
|
predominant
|
6782cb019c
|
Update CakePHP Project link.
|
2009-11-06 17:00:11 +11:00 |
|
predominant
|
ceee56013c
|
Remove Subversion $Date$ lines.
|
2009-11-06 16:17:01 +11:00 |
|
predominant
|
04f1b6cdfe
|
Remove Subversion $LastChangedBy$ lines.
|
2009-11-06 16:11:16 +11:00 |
|
predominant
|
42f3f16d60
|
Remove subversion $Revision$ lines.
|
2009-11-06 16:08:02 +11:00 |
|
predominant
|
1b9b0aae5e
|
Updating Copyright date to include 2009.
|
2009-11-06 15:34:28 +11:00 |
|
predominant
|
8f75ff58c7
|
Removing @filesource
|
2009-11-06 15:24:02 +11: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 |
|