Commit graph

830 commits

Author SHA1 Message Date
mark_story
6b5c247162 Merge commit 'origin/1.2' into mergers
Conflicts:
	cake/bootstrap.php
	cake/console/cake.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
mark_story
a7a6dc8c43 Fixing issue where SecurityComponent::_validatePost could generate notices if elements were removed from _Token array.
Tests Added
Fixed #228
2009-11-08 14:12:18 -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
mark_story
4bbfcbff7e Fixing limit:0 and controller::paginate. Removes possibilty to generate sql errors by inputting invalid limit options. Tests updated. Refs #264 2009-11-06 00:44:21 -05: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
phpnut
2bf630f209 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-03 22:03:09 -06:00
phpnut
a1ce9e662c Fixing real issue for Ticket #137
Reverted changes replacing [ and ] with .
2009-11-03 22:02:26 -06:00
mark_story
a3bb77c4f3 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/acl.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/model.php
	cake/console/libs/templates/skel/views/layouts/xml/default.ctp
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/validation.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/no_database.group.php
2009-11-01 12:11:49 -05:00
mark_story
a855a6aa41 Renaming variable. 2009-10-31 16:16:58 -04:00
mark_story
cab64b780c Refactoring switch in Scaffold. 2009-10-31 16:16:25 -04:00
mark_story
3a59bf5ed6 Updating Scaffold to work with any single prefix. You can set $scaffold = to any prefix defined in Routing.prefixes.
Tests added.
2009-10-31 16:06:20 -04:00
mark_story
0637272bd2 Updating doc block on Controller to include more information about $uses. 2009-10-31 14:25:33 -04:00
phpnut
80b1eb4ee2 Merging fix for invalid characters in cookie name.
Fixes
2009-10-28 23:44:30 -05:00
renan.saddam
a15289fba8 Saving few Router::normalize() calls, will may increase performance. Fixes #179. 2009-10-20 16:16:31 -02:00
ADmad
47558d4fe1 Renaming "flashLayout" to "flashElement" to be consistent with changes to Session component and helper
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-14 18:18:18 -04:00
mark_story
d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in
Conflicts:
	cake/console/libs/shell.php
	cake/libs/model/connection_manager.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
mark_story
e5a99b2685 Updating RequestHandler::renderAs() to respect DS constant, fixing issues on PHP4 + Windows. Fixes #97 2009-10-12 23:55:40 -04:00
mark_story
9a023136e3 Merge branch '1.3-misc' into 1.3 2009-10-06 17:23:35 -04:00
mark_story
8acf1eeba0 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-10-06 09:09:18 -04:00
mark_story
07002c8b09 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-10-03 11:44:26 -04:00
ADmad
10aa5d158b Updating find calls to use new syntax
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-02 15:50:36 -04:00
mark_story
4794680444 Deprecating CakeSession::del(), use delete() instead.
Updating file headers.
Updating test cases.
2009-10-02 13:11:43 -04:00
mark_story
2fe20a2264 Updating redirects in Scaffold. 2009-09-29 00:56:25 -04:00
mark_story
070bbb5d0e Removing magic 'title' key in Controller::set() and View::set()
Removing Controller::$pageTitle and View::$pageTitle.
Instead you should set('title_for_layout', $val) from your view or controller.
Test cases updated.
2009-09-28 21:23:40 -04:00
mark_story
daa97f702a Fixing use of deprecated method. 2009-09-25 11:36:27 -04:00
jperras
cd64043702 Adding the 'client' option to the doc block for the email component smtp options. Fixes #111. 2009-09-22 23:10:35 -04:00
jperras
2b0d13733e Fixing parameter ordering error of array_map in AuthComponent::allow(). Adding test. 2009-09-21 12:14:20 -04:00
mark_story
50bd279018 Merge branch '1.3-auth' into 1.3 2009-09-20 17:53:23 -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
4a6412fb27 Adding tests for AuthComponent::action().
Adding plugin support for AuthComponent in actions mode.  Refs #33
2009-09-14 00:29:33 -04:00
mark_story
090eb27be1 Updating imports in AuthComponent and AuthComponent test case. 2009-09-13 23:42:25 -04:00
Niles
b9970f7484 replace deprecated method calls. 2009-09-11 06:58:23 -04:00
jperras
4dc656fd91 Updating EmailComponent smtp HELO handling to account for non-existence of HTTP_HOST environment variable when PHP SAPI is CLI. Fixes #41. 2009-09-07 11:18:11 -04:00
mark_story
17e81ab346 Updating session component, to not use layout, and use elements instead.
Tests updated.
2009-08-31 23:59:40 -04:00
mark_story
1bedd8418b Merge branch '1.3-deprecation' into 1.3-misc 2009-08-31 23:41:41 -04:00
mark_story
9afa4d1c3a Updating test case to reflect API changes. 2009-08-31 22:52:15 -04:00
mark_story
4ee70c01a8 Updating tests to reflect API deprecations. 2009-08-31 22:50:46 -04:00
mark_story
046d7c75d0 Adding warnings to newly deprecated methods. 2009-08-31 22:31:36 -04:00
mark_story
71e93b9ae8 Fixing Scaffold not using session flashes even when they are available.
Simplifying message generation. Refs #64
2009-08-31 14:33:01 -04:00
mark_story
f6ce178d85 Simplifying message generation.
Fixing inflection of model names.
Adding tests for flash page generation. Refs #64
2009-08-31 14:24:50 -04:00
mark_story
0097e8c14b Updating Scaffold to merge hasAndBelongsToMany keys when generating field lists for scaffolded forms. Fixes #48 2009-08-31 14:22:37 -04:00