Commit graph

5258 commits

Author SHA1 Message Date
Mark Story
a3da915abd Fixing issue where value in difference array was always the string value instead of the original value. 2010-10-31 22:41:33 -04:00
Mark Story
c2063f1229 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-10-31 21:58:38 -04:00
Mark Story
b67d3fac44 Updating FormHelper to fix failing test from merge. 2010-10-31 21:57:51 -04:00
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
Juan Basso
7f448a1d35 Allowed the use of empty() and isset() in Controllers aliases properties. 2010-10-31 22:02:26 -02: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
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
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
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
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
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
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
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
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
mark_story
a16f4c5248 Updating version numbers for 1.3.5 2010-10-24 13:56:45 -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
7aaf7e6b68 Fixing issue where Xml would not read CDATA blocks. 2010-10-23 11:01:13 -04:00
mark_story
7c296211ef Making generating schema for connections with prefixes work correctly. The prefix needs to be removed so that when tables are created or updated they do not get the prefix added twice.
Moving tests around. Fixes #1180
2010-10-20 23:17:04 -04:00
mark_story
498417203b Making DboSource::fields() use cacheMethod() so it respects $cacheMethods.
Test added.
Fixes #1211
2010-10-20 22:28:31 -04:00
mark_story
077d1c5ad5 Applying patch from 'hashmich' to fix issues with slideUp and slideDown effects in prototype engine.
Tests updated.
Fixes #1213
2010-10-20 22:07:53 -04:00
ADmad
ffc77aa588 Adding "function_exists" check before using "ini_set" in Debugger::__construct(). Fixes #1209 2010-10-20 02:16:17 +05:30
mark_story
1c25e627ad Applying patch from 'Mark Mitchell' fixes issues with sending Email via smtp. Which were incorrect based on previous patches given for ticket #1100.
Fixes #1205, Fixes #1204
2010-10-18 22:06:12 -04:00
Juan Basso
d771239104 Fixed support to save XML data in Models. 2010-10-17 22:47:43 -02:00
mark_story
61864a3b76 Adding some missing documentation and cleaning up code inside FormHelper::select(). 2010-10-16 13:40:27 -04:00
mark_story
c35ef7dbab Making class attribute bubble down into FormHelper::__selectOption().
Fixes issue where you couldn't change the classname of checkbox options.
Fixes #1202
2010-10-16 13:32:04 -04:00
mark_story
67874bd906 Fixing issue where defining a pattern for :action would create an optional route parameter that wouldn't respect its pattern.
Added the default action value only when a pattern isn't defined.
Added tests to CakeRoute and Router to cover this case.
Fixes #1197
2010-10-14 21:54:44 -04:00
mark_story
517c8949f9 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-10-13 23:17:50 -04:00
mark_story
f19e3d501c Merge branch '1.3' into integration
Conflicts:
	cake/libs/model/cake_schema.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/model.php
	cake/libs/view/helpers/form.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
mark_story
6529e0e2b4 Making optiongroup elements follow the escape parameter.
Tests added.
Fixes #1191
2010-10-13 21:59:53 -04:00
mark_story
3f2109f3c3 Applying patch from 'dragonfly' to fix issue where FormHelper would always append an argument even if one was supplied.
Test Added
Fixes #1155
2010-10-13 21:36:05 -04:00