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
Mark Story
1f25bb31c0
Refactoring option extraction into a separate method.
2010-02-27 11:01:28 -05:00
Mark Story
3192e130af
Fixing magic select creation for fields that have plural variables added to the view.
2010-02-27 11:01:28 -05:00
José Lorenzo Rodríguez
056b87d13a
Implementing template for input formats, test pending
2010-02-26 18:39:33 -04:30
Mark Story
e4b392a4ff
Updating and expanding form helper submit documentation. Refs #335
2010-02-24 22:58:09 -05:00
Mark Story
47afceea22
Expanding documentation for FormHelper::submit() Fixes #390
2010-02-24 22:54:48 -05:00
Mark Story
348fe6f574
Expanding documentation for FormHelper::submit() Fixes #390
2010-02-24 22:45:49 -05:00
José Lorenzo Rodríguez
9a4de854d6
Improving the guessing process of required fields in the form helper.
...
Now it does not rely on the "required" property of the validation array anymore, which was misleading
2010-02-23 09:55:01 -04:30
Mark Story
06fc87fc2d
Fixing lack of space in meta tags lacking a link attribute.
...
Fixes #371
2010-02-20 01:41:56 -05:00
Mark Story
f4c670e5be
Fixing lack of space in meta tags lacking a link attribute.
...
Fixes #371
2010-02-20 01:39:15 -05:00
Mark Story
6a3347ef7c
Merge remote branch 'origin/1.2' into 1.2-merger
...
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/console/libs/tasks/model.php
cake/dispatcher.php
cake/libs/l10n.php
cake/libs/model/datasources/dbo_source.php
cake/libs/view/pages/home.ctp
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/text.test.php
2010-02-20 01:32:04 -05:00
Mark Story
96bbbb2d72
Applying fixes made to JavascriptHelper to JsBaseEngine.
2010-02-17 22:27:52 -05:00
Mark Story
ab688b88f4
Adding test to check that postfix and prefix options don't go into inner objects. Tests added, fixes #348
2010-02-17 22:22:53 -05:00
Mark Story
2209f198f8
Adding test to check that postfix and prefix options don't go into inner objects. Tests added, fixes #348
2010-02-17 22:21:48 -05:00
Mark Story
a479f32da5
Clarifying the behaviour of FormHelper::button() fixes #335
2010-02-12 23:58:35 -05:00
Mark Story
3a03672379
Fixing formatting of code.
2010-02-09 21:05:01 -05:00
Mark Story
0fda18d11c
Fixing entity encoding of url strings inside remoteFunctions contained in safe CDATA blocks. Fixes #127
2010-02-08 23:07:13 -05:00
ADmad
6f08d86c8e
Links generated by PaginatorHelper::prev and PaginatorHelper::next are now wrapped in 'span' or the tag specified in options. Fixes #311
2010-02-07 23:56:50 +05:30
Mark Story
7daad4acaf
Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2
2010-02-02 20:39:25 -05:00
predominant
8d382d9168
Fixes #288 . TextHelper truncation not playing nice with html in ending.
2010-02-02 09:13:52 +11:00
ADmad
59a4732eb8
Fixing issue where value of '$and' was appended to output string even when list array contained only one element. Fixed #285
2010-01-31 23:43:58 +05:30
Mark Story
832b15ba3e
Fixing issues in JqueryEngineHelper where eval()'ed responses wouldn't run code contained inside $js->domReady() due to implementation differences between $(document).ready() and $(document).bind('ready'). Tests updated.
2010-01-29 10:06:47 -05:00
ADmad
c9e047ce37
Adding 'orderYear' option for FormHelper::year to allow control over ordering of select options
2010-01-28 01:48:53 +05:30