Mark Story
|
09ad7418f5
|
Merge remote branch 'origin/1.2' into merger
Conflicts:
cake/console/templates/skel/config/inflections.php
cake/libs/model/cake_schema.php
cake/libs/model/model.php
|
2010-01-15 11:51:58 -05:00 |
|
Mark Story
|
8243afa383
|
Updating css file in skel dir.
|
2010-01-13 23:03:02 -05:00 |
|
Mark Story
|
f93094b6ea
|
Moving skel/config/sql to skel/config/schema
Updating index.php and test.php in skel dir.
|
2010-01-13 00:17:15 -05:00 |
|
Mark Story
|
1183846390
|
Removing $cakeDebug from skel layout.
|
2009-12-28 10:20:11 -05:00 |
|
ceeram
|
64045e1e18
|
Apply new Helper syntax to remaining files
Signed-off-by: Mark Story <mark@mark-story.com>
|
2009-12-14 18:52:13 -05:00 |
|
predominant
|
6be2fd05e4
|
Changing default Security.level to medium.
|
2009-12-13 11:59:14 +11:00 |
|
predominant
|
8b9ee22c84
|
Removing "Long description for file" from /cake/console tree.
|
2009-12-08 20:18:19 +11:00 |
|
mark_story
|
24b636cc71
|
Merge branch 'mergers' into 1.2-merger
Conflicts:
cake/libs/view/helpers/text.php
cake/tests/cases/libs/view/helpers/text.test.php
|
2009-12-06 22:03:17 -05:00 |
|
mark_story
|
7259a1b920
|
Merge branch '1.2' into 1.2-merger
Conflicts:
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/helpers/text.php
cake/libs/view/theme.php
|
2009-12-06 21:43:53 -05:00 |
|
mark_story
|
ae98a556d6
|
Removing vendors/img, vendors/css and vendors/js from skel dirs.
|
2009-11-25 22:51:33 -05:00 |
|
mark_story
|
8cdee90b4f
|
Merge branch '1.3-misc' into 1.3-merger
Conflicts:
cake/libs/view/helpers/html.php
|
2009-11-22 21:28:14 -05:00 |
|
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 |
|
mark_story
|
94c0ec1699
|
Adding libs to templates/skel so baked projects contain an app/libs dir.
|
2009-11-17 10:27:09 -05:00 |
|
mark_story
|
925fda7ba6
|
Updating core layout, and skel layout to reflect changes in session->flash().
Updating skel layout to use $this->Helper.
|
2009-11-16 20:01:55 -05:00 |
|
predominant
|
1185681549
|
Removing newline caused by Subversion line removal.
|
2009-11-06 18:01:22 +11: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
|
5dfe1777af
|
Removing Subversion file headers.
|
2009-11-06 16:51:09 +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
|
6c18c0e0c7
|
Fixing escape parameter usage.
|
2009-10-28 18:41:29 -04:00 |
|
predominant
|
ae76c44945
|
Update Default layout link escaping.
|
2009-10-19 21:34:53 +11:00 |
|
mark_story
|
552f698d4e
|
Adding Routing.prefixes configuration value to core.php.
Deprecating Routing.admin
|
2009-09-27 00:18:24 -04:00 |
|
mark_story
|
dc013dadb1
|
Updating file headers in test.php files.
|
2009-09-16 01:34:37 -04:00 |
|
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 |
|
renan.saddam
|
2e8bbd5eb1
|
Adding docblock for the new variable used for logging. Making the CakeLog::handleError logs the same output as in Debugger::handleError.
|
2009-09-10 12:32:21 -03:00 |
|
mark_story
|
213b78727f
|
Removing use of e() from core and test suite.
|
2009-08-27 22:51:10 -04:00 |
|
AD7six
|
993643dd2a
|
whitespace normalization
|
2009-08-02 16:10:12 -07:00 |
|
gwoo
|
15ed658a27
|
Revert "Merge branch '1.3-newlines' into 1.3"
This reverts commit c088131cd8e9f53396852e8a320e2b0396807d20, reversing
changes made to 9341a2bb5eda1db208019aa8a9171224fb76fc6b.
|
2009-08-02 15:59:54 -07: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 |
|
AD7six
|
d54369e29e
|
CONSOLE_LIBS isn't an absolute path
Adding app vendor folders
Correcting plugin test to match changes to the task
|
2009-07-29 10:12:54 +02:00 |
|
AD7six
|
59317fb5a0
|
Merge branch '1.3' into 1.3-bake
|
2009-07-27 13:10:11 +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 |
|