Commit graph

8677 commits

Author SHA1 Message Date
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
Mark Story
b86bec14b5 Removing dead code in EmailComponent.
Fixes #1248
2010-10-31 00:00:54 -04:00
Mark Story
d5f582beee Merge branch 'master' of http://github.com/kwiky/cakephp into kwicky 2010-10-30 00:29:21 -04:00
Mark Story
e9851a644b Merge branch 'form-selected' into 2.0 2010-10-30 00:08:21 -04:00
Mark Story
3b5dafadc5 Adding value option documentation. 2010-10-29 23:56:22 -04:00
Robert Sworder
593c45b6e7 Whitespace changes 2010-10-29 23:43:50 -04:00
Robert Sworder
9eb533b9f6 dateTime functions + tests 2010-10-29 23:43:50 -04:00
Robert Sworder
a876c77987 meridian function 2010-10-29 23:43:50 -04:00
Robert Sworder
6d97aedd47 __selectOptions function 2010-10-29 23:43:50 -04:00
Robert Sworder
d3c1e8c974 minute function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
5f0700342b hour function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
6620b3b8fc month function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
529791842c year function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
a1b1a07af2 __dateTimeSelected and day functions done, with tests 2010-10-29 23:43:48 -04:00
Robert Sworder
30f3494c98 Select function signature changed. Corresponding tests changed. 2010-10-29 23:43:48 -04:00
Robert Sworder
115c6102b9 Changes to make tests pass... 2010-10-29 23:43:48 -04:00
Juan Basso
5674ac4cf8 Added the require to dispatcher in skel to cake bake. 2010-10-30 01:29:26 -02:00
Juan Basso
2d9d4547f4 Importing File class, used by some methods. 2010-10-30 01:26:18 -02:00
Mark Story
148870f492 Using a simple regexp instead of a strpos to ensure the protocol is at the beginning of the url. 2010-10-29 22:10:24 -04:00
Mark Story
3a95a546e8 Doing some code cleanup and moving conditionals around. 2010-10-29 21:45:09 -04:00
Mark Story
dbce29a058 Doing some refactoring, to reduce code duplication. 2010-10-29 21:37:03 -04:00
Mark Story
3ca0cdb1ee Adding support for route objects to return full urls. These urls are not changed by Router, and just returned. This will allow subdomain route classes to be created.
Tests added.
2010-10-29 21:33:56 -04:00
mark_story
14ec8703c1 Removing dirty hack in Router for detecting requestAction. 2010-10-29 11:16:50 -04:00
mark_story
086cf279ba Applying doc block changes to app/config/core.php as well. Fixes #1138 2010-10-29 00:16:42 -04:00
mark_story
18bffe8600 Applying doc block changes from 'teknoid'. Fixes #1239 2010-10-29 00:15:48 -04:00
mark_story
f29bb562cb Adding a test for saving blank fields on a model. Closes #1243. 2010-10-29 00:13:09 -04:00
mark_story
f5fd069583 Applying patch from 'Justas Butkus' to fix CakeSchema::compare()
Fixes issues with comparing null == '' and adds a new protected method to handle null aware array difference generation.
Tests added.
Fixes #1206
2010-10-27 23:03:31 -04:00
mark_story
16387f1961 Applying patch from 'Utoxin' that removes hardcoded 'app' string from Dispatcher. Fixes #1231 2010-10-27 22:42:12 -04:00
mark_story
d7847288e4 Adding Fennec as a built-in mobile browser.
Refactoring a test case to pull out the exceptional case.
Fixes #932
2010-10-27 22:32:15 -04:00
mark_story
1166806218 Removing shutup operator from View::_render()
Errors in your views will not be suppressed when debug = 0 anymore.
Fixes #943
2010-10-26 23:12:24 -04:00
mark_story
3639f52117 Adding a test for containable modifying return. Refs #1219 2010-10-26 21:39:48 -04:00
Steve Grosbois
bc3a9e8a3a Removing a dot at the end of a message in mission_action.ctp because there is no dot in the same message in all other errors view, this can help for traductors 2010-10-25 11:43:03 +02:00
SKAhack
9f2d33aa88 meta characters don't match on regex string
Signed-off-by: mark_story <mark@mark-story.com>
2010-10-24 21:42:11 -04:00
SKAhack
23f1c8e1c7 Fix regex match when regex included meta characters
Signed-off-by: mark_story <mark@mark-story.com>
2010-10-24 21:42:04 -04:00
mark_story
f61e8b48b6 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-10-24 20:58:58 -04:00
mark_story
a57f8d3851 Adding another test for csrfUseOnce. 2010-10-24 20:57:12 -04:00
Juan Basso
cda0ce4727 Testing the build of XML. If it is invalid will generate a Exception. 2010-10-24 22:42:05 -02:00
mark_story
22239b4481 Making the ability to use longer shared csrf tokens possible. This should make for fewer blackholed' requests when doing complicated javascript. 2010-10-24 20:26:31 -04:00
mark_story
4496a0a0bb Reformatting code to use tabs.
Fixing issue with float comparison.
Fixes #219
2010-10-24 19:43:41 -04:00
C. James Callaway
b8f0dda964 Updating to match ticket, using radians() SQL function. 2010-10-24 19:39:18 -04:00
C. James Callaway
a429287c19 Adding testcase for ticket #219 2010-10-24 19:38:23 -04:00
mark_story
c6c3295c5c Making default bake templates escape HTML. Fixes #1186 2010-10-24 19:34:57 -04:00
mark_story
eb3cc3db3a Making default scaffold views html escape contents. Refs #1186 2010-10-24 19:30:22 -04:00
Graham Weldon
d3e0ddbb0e Update copyright years. 2010-10-25 07:58:22 +11:00
Victor Castell
141b05e588 Updated copyright years in skel aplication template 2010-10-25 07:57:15 +11:00
mark_story
a16f4c5248 Updating version numbers for 1.3.5 2010-10-24 13:56:45 -04:00
mark_story
54854c493b Changing output buffering, as ajaxtest was making output and breaking tests in group contexts. 2010-10-24 00:39:46 -04:00
mark_story
155bfe6293 Fixing failing test caused by setting an expiry value outside of the PECL extensions limits. 2010-10-24 00:05:27 -04:00
mark_story
bf7b8b0e93 Fixing issues with RssHelper and updating tests to reflect changes in how Xml::build() differs from previous versions' Xml. 2010-10-23 13:11:50 -04:00
mark_story
3e2d09a802 Making h() preserve keys when escaping an array. 2010-10-23 12:18:39 -04:00