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
9ae8b737dc
Trimming trailing whitespace.
2010-04-17 13:05:26 -04:00
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
c7fcaf995f
Convert getMictime() php4 hack to microtime(true)
2010-04-16 02:58: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
Mark Story
958578c746
Fixing magic method visibility on Helper.
2010-04-13 23:54:21 -04:00
José Lorenzo Rodríguez
0300fc1c31
If connection is aborted, now MediaView returns false after stopping the transfer
2010-04-13 16:55:22 -04:30
José Lorenzo Rodríguez
940ce8b06e
Adding some test coverage on MediaView.
...
Now MediaView does not exit after successful render, closes #569
2010-04-13 16:44:14 -04:30
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
Mark Story
e2b5470d19
Updating version numbers to 1.3.0-RC4
2010-04-12 22:27:18 -04: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
51d71b4541
Adjust view __scripts to be a protected instance variable, and add test methods for View addScript tests.
2010-04-05 21:15:17 +10:00
predominant
34c7c1551f
Added default constructor.
2010-04-05 17:30:24 +10:00
predominant
f5fa56ff3c
Remove Overloadable from Helper class.
2010-04-05 16:45:14 +10:00
predominant
57b52cf577
Fix access not being specified on certain methods in Helper.
2010-04-05 16:39:29 +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
3f343e7874
Updating version numbers to 1.3.0-RC3
2010-03-28 19:13:49 -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
46348e9bbd
Adding and correcting doc blocks.
2010-03-28 12:53:57 -04:00
Mark Story
8f20b12c58
Expanding the documentation related to showParents and options. Fixes #479 .
2010-03-20 19:43:52 -04:00
José Lorenzo Rodríguez
93ac79d4fb
Chaging array_push call for array_merge, as the first one would produce worng nested arrays in MediaView. closes #391
2010-03-17 16:45:39 -04:30
Mark Story
edf2ea1e74
Updating version numbers to 1.3.0-RC2
2010-03-14 16:44:54 -04:00
Mark Story
3d4b1e365d
Removing deprecated method missed in last release candidate.
2010-03-14 16:06:31 -04:00
José Lorenzo Rodríguez
d8a757ce75
Fixing empty value check to avoid a mistaken default value selection in Helper::value. closes #290
2010-03-10 15:16:02 -04:30
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
