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
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
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
Robert Sworder
ec10a01504
Changing home.ctp to remove references to 1.2. Fixes #705
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-10 23:48:12 -04:00
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
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
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
bd485c77d3
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-04-27 22:42:54 -04:00
Mark Story
bb239e3816
Fixing parse error in php4 for MediaView. Also fixing undefined variable error in Dispatcher. Fixes #628
2010-04-27 22:42:33 -04:00
predominant
1c064788c5
Updated vesion numbers to 1.3.0
2010-04-25 14:27:29 +10:00
Mark Story
a17a38ddf4
Fixing fatal errors in View test.
...
Removing =& and making tests use instanceof instead of is_object()
2010-04-24 00:22:21 -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
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
