Commit graph

1146 commits

Author SHA1 Message Date
mark_story
ecf7811b7a Merge branch '2.0' into 2.0-request
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/components/request_handler.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
2010-06-27 23:21:11 -04:00
mark_story
929bb5769e Merge branch '1.3' into 2.0
Conflicts:
	app/webroot/index.php
	cake/console/templates/skel/webroot/index.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/model_behavior.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
mark_story
5945edd983 Removing strtolower call that was breaking autolinks for URL shorteners. Tests added. Fixes #838 2010-06-21 21:17:37 -04:00
Thomas Ploch
2d20215e53 Converted JsBaseEngineHelper to an abstract class. Fixes #703 .
Signed-off-by: mark_story <mark@mark-story.com>
2010-06-20 22:21:21 -04:00
mark_story
50144d6b5b Making FormHelper clear fields on create() as well as end() this ensures that GET forms don't leak fields. Fixes #571 2010-06-12 22:50:09 -04:00
mark_story
e41e89cd2a Making magic select not override magic hidden. Tests added.
Fixes #782
2010-06-04 00:20:14 -04:00
predominant
8decc683ac Numerous 'shoer description' documentation entries updated to contain useful comments. 2010-05-30 01:20:28 +10:00
predominant
f06f0dae8b Numerous "Enter description here" block comments updated to have meaningful descriptions. 2010-05-30 01:10:48 +10:00
mark_story
82250efc3e Updating doc blocks for FormHelper::input() refs #735 2010-05-20 22:58:20 -04:00
predominant
6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
mark_story
76f94d5c75 Fixing form attribute access and broken test. 2010-05-17 23:31:47 -04:00
mark_story
f114d4299d Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/router.php
	cake/tests/cases/libs/router.test.php
2010-05-17 21:52:14 -04:00
mark_story
3a60aa07de Fixing issues where setting jQueryObject did not affect request() and its connected methods.
Tests added.
Fixes #728
2010-05-17 18:25:50 -04:00
mark_story
4915645fb1 Applying patch from 'Daren Thomas' fixes issues where sorting on virtualFields did not work properly when using aliased sort link keys. Tests added. Fixes #680 2010-05-16 23:42:14 -04:00
mark_story
e6a743b163 Making JsHelper use its request object methods. 2010-05-15 00:51:26 -04:00
mark_story
0eebda9ee1 Updating HtmlHelper test to use request object.
Removing reference operators.
2010-05-14 23:11:38 -04:00
Mark Story
3983bf318d Updating PaginatorHelper and its test cases to use the request object. 2010-05-14 00:32:56 -04:00
Mark Story
c5dfd128fb Updating FormHelper and its tests to use the request object. 2010-05-14 00:21:22 -04:00
Mark Story
0d3011d2c3 Updating CacheHelper to use CakeRequest. 2010-05-14 00:12:29 -04:00
Mark Story
353c600cd7 Removing unreachable code. Fixes #614 2010-05-13 23:38:26 -04:00
ADmad
3539660cd0 Space is now properly added inbetween when 'asc'/'desc' class is appended to user defined css class in PaginatorHelper::sort. Fixes #710 2010-05-12 00:42:02 +05:30
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
Mark Story
0930b5c63c Adding more documentation for JsHelper::submit(). Closes #681 2010-05-07 21:26:44 -04:00
Mark Story
1c3415759a Fixing 'Only variables should be assigned by reference' errors in php4 in form helper. Fixes #643 2010-05-06 22:11:31 -04:00
Mark Story
c48f6d6536 Fixing safe parameter from leaking into request() calls in JsHelper::submit() and JsHelper::link(). Fixes #656 2010-05-02 21:17:10 -04:00
Mark Story
d94ff92a9d Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/lib/reporter/cake_html_reporter.php
2010-05-02 18:03:23 -04:00
Mark Story
adf604a966 Merge branch '1.3' into 2.0
Conflicts:
	cake/console/templates/default/actions/controller_actions.ctp
	cake/console/templates/default/views/form.ctp
	cake/console/templates/default/views/index.ctp
	cake/console/templates/default/views/view.ctp
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
2010-05-02 17:53:42 -04:00
Mark Story
26279851e1 Making Router::setRequestInfo() able to accept arrays. It will convert older style arrays into a CakeRequest object for later use.
Updating uses of Router::setRequestInfo() to just pass the object where possible.
2010-05-02 01:59:56 -04:00
Mark Story
12cbf3198a Removing addslashes/stripslashes in cache file generation as they were creating corrupted serialized objects. Replacing with a simple str_replace() on ' instead. 2010-05-02 00:12:53 -04:00
José Lorenzo Rodríguez
ad51115e12 Fixing bug where required class would be added to form fields when using single rule syntax in $validate even if allowEmpty is set to true
Closes #654
2010-04-30 16:42:59 -04:30
Mark Story
57648c5492 Fixing parameters from leaking into the script tag when calling JsHelper::submit(). Added test cases and refactored JsHelper::link(). Fixes #613 2010-04-29 00:20:35 -04:00
Mark Story
33bfe0e5e2 Making Helper extend Object, this fixes issues where Helpers would not have dispatchMethod or requestAction available.
Correcting JsHelper::call__ into JsHelper::__call
Updating test cases to remove reference operators
2010-04-23 21:21:31 -04:00
Mark Story
bf566e1aad Fixing failing tests in PaginatorHelper and moving tests related to JsHelper interaction into a separate test method. 2010-04-23 21:10:23 -04:00
Mark Story
bc6b8e5dfd Fixing parameters from leaking into the script tag when calling JsHelper::submit(). Added test cases and refactored JsHelper::link(). Fixes #613 2010-04-23 00:04:15 -04:00
predominant
015872445b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/acl.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
2010-04-23 12:52:56 +10:00
kleingeist
6033fc70fa Documentation fix for XmlHelper::serialize
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-22 21:27:17 -04:00
José Lorenzo Rodríguez
65f01fa31c Fixing model introspection in FormHelper to better take in account realted models with aliased names 2010-04-22 16:37:15 -04:30
José Lorenzo Rodríguez
5ceb19304e Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 2010-04-19 23:33:43 -04:30
José Lorenzo Rodríguez
e1c4b9696b Adding documentation on 'attributes' key for FormHelper::error 2010-04-19 23:32:58 -04:30
José Lorenzo Rodríguez
23eea00a0b Fixing FormHelper::error to no add error names and messages as html attributes. Fixes #585
This introduces the special key 'attributes' to FormHelper::error() when passed in the second parameter
The contents of said key will be converted into html attributes for the error container tag
2010-04-19 23:25:57 -04:30
Mark Story
bb7cc60d3f Fixing parse error added in last commit :( 2010-04-17 02:13:22 -04:00
predominant
92215e1795 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/libs/inflector.php
	cake/libs/view/helpers/text.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/helpers/time.test.php
2010-04-16 23:43:28 +10:00
predominant
c98021dcd8 Converted views, router and security classes to new translation shotcut function use. 2010-04-16 02:20:15 +10:00
Mark Story
8ef2a82a89 minor optimization to save one call to Helper::model() when creating forms. 2010-04-14 21:00:00 -04:00
Mark Story
c4d57bd6e7 Removing AjaxHelper and JavascriptHelper as they were deprecated in 1.3 and are replaced by JsHelper + HtmlHelper. 2010-04-14 00:13:33 -04:00
Mariano Iglesias
388bca4acd Fixing syntax error generated by last merge conflict 2010-04-13 15:46:12 -03:00
Mariano Iglesias
a6b83cdd93 Fixing issue where TextHelper::autoLinkUrls was failing on some expressions 2010-04-13 15:39:30 -03:00
predominant
52cdef900b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/tree.php
	cake/libs/router.php
	cake/tests/cases/libs/validation.test.php
2010-04-09 22:05:00 +10:00
Mark Story
30e6c57a96 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-08 23:37:27 -04:00