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
Mark Story
c38249ac28
Updating HtmlHelper + JavascriptHelper to call assetTimestamp() after webroot(). This allows theme files in webroot/theme to be correctly timestamped.
...
Updating tests to reflect changes in behaviour. Fixes #244
2010-04-08 23:36:04 -04:00
José Lorenzo Rodríguez
03e3c3249f
Removing whitespace at the end of the file
2010-04-08 22:15:49 -04:30
José Lorenzo Rodríguez
59f7cb47d3
Improving test coverage on FormHelper to show the usage of the 'secure' key for inputs.
...
Fixing issue with select inputs that does not honor the value of 'secure'
2010-04-08 18:23:07 -04:30
predominant
e4d292bfa4
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/console/libs/shell.php
cake/libs/controller/components/acl.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/email.php
cake/libs/controller/components/security.php
cake/libs/controller/components/session.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/number.php
cake/libs/view/helpers/session.php
cake/libs/view/helpers/text.php
cake/libs/view/helpers/time.php
cake/libs/view/helpers/xml.php
2010-04-06 12:19:34 +10:00
predominant
50a547167b
Changing protected methods to specify protected access.
2010-04-05 13:21:28 +10:00
predominant
1497ec3910
Changed all public methods to specify public access.
2010-04-05 13:19:38 +10:00
sdoney
dde52399ca
Adding @link tags pointing to cookbook sections
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-04 22:09:49 -04:00
predominant
850ca02bb6
Changed all public 'var' declarations to be 'public $var'
2010-04-04 17:14:00 +10:00
predominant
329a13fe5f
Changed all $_ declared variables to protected.
2010-04-04 16:36:12 +10:00
predominant
29dc12dbc2
Changed all $__ declared variables to private.
2010-04-04 16:33:39 +10:00
Mark Story
3503872ab8
Fixing Form::dateTime() for GET forms. Tests added. Fixes #522
2010-04-02 15:50:43 -04:00
Mark Story
17852ab3aa
Fixing failing tests in SessionHelper caused by changes in CakeSession. Removing SessionHelper::id() as all it did was call the parent method.
2010-03-28 17:41:58 -04:00
Mark Story
8f20b12c58
Expanding the documentation related to showParents and options. Fixes #479 .
2010-03-20 19:43:52 -04:00
Mark Story
3d4b1e365d
Removing deprecated method missed in last release candidate.
2010-03-14 16:06:31 -04:00
Mark Story
bed4027d37
Making JsHelper::writeBuffer() use the isAjax param to hint the domReady() event. Disabling domready events when the request isAjax fixes issues in prototype and makes output code simpler. Fixes #429
2010-03-08 22:51:46 -05:00
Mark Story
41bdc48fd3
Fixing whitespacing.
2010-03-08 22:49:09 -05:00
predominant
2218d186c8
Revert "Fixing escaping of forward slash for JS Engines."
...
This reverts commit 7334fdfbdf
2010-03-09 14:30:28 +11:00
predominant
7d81d81176
Merge remote branch 'origin/1.3' into 1.3
2010-03-09 12:28:06 +11:00
predominant
7334fdfbdf
Fixing escaping of forward slash for JS Engines.
2010-03-09 12:26:25 +11:00
Mark Story
8216f5010c
Fixing @see tags in JsEngines
2010-03-06 10:46:26 -05:00
Mark Story
1d449e3847
Refactoring label generation into a method.
...
Fixing issues with labels having a for attribute = Array when an array of id's is provided.
Fixing issues where a date input would require you to provide id keys for hour, minute, and meridian even if you were not using them.
Fixes #411
2010-03-04 22:46:43 -05:00
ADmad
8dfadafc88
Changing ternary operator usage syntax to be compliant with php 5.2 and below
2010-02-28 13:05:00 +05:30
Mark Story
e0abe99d7d
Merge remote branch 'origin/1.2' into 1.2-merger
...
Conflicts:
cake/libs/view/helpers/html.php
cake/tests/cases/libs/folder.test.php
2010-02-28 01:58:29 -05:00
José Lorenzo Rodríguez
1f1e0f4ff7
Merge commit 'origin/1.3' into 1.3-form
2010-02-27 23:23:43 -04:30
José Lorenzo Rodríguez
b782563daf
Adding test for form input templates
2010-02-27 23:18:21 -04:30
José Lorenzo Rodríguez
0ca5c11e6c
Making the form helper put the "required" class on all imputs that have a validation rule and does not explicitly sets allowEmpty => true in validation array
2010-02-27 22:58:27 -04:30
