mark_story
75dd2ff1fb
Merge branch 'master' into 2.5
2014-01-16 15:20:40 -05:00
mark_story
f25e84f4fb
Don't select year 0 when there are all 0's.
...
Year 0 is almost never a 'good' selection value and causes odd behavior
when paired with MySQL.
Fixes #2658
2014-01-15 10:23:45 -05:00
mark_story
3cee3b0e99
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-12-30 21:28:22 -05:00
Mark Story
1cb7e4f0ff
Merge pull request #1635 from dereuromark/master-dom-ids
...
Fix duplicate ID generation of for multiple checkboxes.
2013-12-24 07:02:38 -08:00
mark_story
7e5c0f7185
Merge branch 'master' into 2.5
2013-12-20 14:15:35 -05:00
mark_story
5bddc477a3
Fix incorrectly handled time values around 12:00:00
...
When using 12 hour formats & intervals, values around 12:00 were
incorrecly converted to midnight.
Fixes #2507
2013-12-19 17:36:27 -05:00
mark_story
30e139412d
Fix input type inference when type=>checkbox
...
FormHelper should not infer types when the explicit type is checkbox.
Instead the provided type should be used.
Fixes #2491
2013-12-16 23:26:20 -05:00
euromark
8ebf004450
Also make DOM ids for radio element values unique.
2013-12-04 02:14:08 +01:00
euromark
587a04ab84
prevent possible XSS attack via form helper selects and unescaped output.
2013-12-04 01:51:39 +01:00
euromark
aae0f762dd
Collision free approach to resolve the DOM ID issue in a clean way. Fix to generation of ids for multiple checkboxes. Resolves ticket 4064.
2013-12-04 01:30:57 +01:00
mark_story
8578708e76
Merge branch 'master' into 2.5
2013-12-01 21:37:37 -05:00
mark_story
a9ca1bdc58
Add tests and fix other cases where autoLinkEmail would fail.
...
Refs #2403
2013-11-29 22:57:43 -05:00
mark_story
7c66d0db50
Fix autoLink() when URLs contain email addresses.
...
Add whitespace lookbehind to ensure the email address is preceded by
whitespace, this obviously means that emails starting with word/symbols
are not detected, however those symbols are generally valid in an email
address anyways, and will form the local part.
Fixes #2403
2013-11-29 22:24:03 -05:00
mark_story
3b8208be2e
Merge branch 'master' into 2.5
2013-11-18 21:49:13 -05:00
Matheus Pedroso
4677ddf490
Fix duplicated webroot path on HtmlHelper::meta('icon').
2013-11-18 23:38:01 -02:00
ADmad
dda6080579
Merge branch 'master' into 2.5
2013-11-19 00:27:12 +05:30
Marc Würth
7cfa0116f4
Removed "PHP 5" from file header DocBlocks
...
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
mark_story
a07608cbb9
Fix incorrect CSRF token fields when using postLink()
...
Creating a postLink after creating a GET form would result in the
incorrect fields being generated.
Fixes #2308
2013-11-11 21:56:55 -05:00
mark_story
3561929be7
Merge branch 'master' into 2.5
2013-11-10 21:53:09 -05:00
mark_story
8d38861a2e
Fix missing HTML encoding on URL's generated by Html->meta().
...
The input URL was not correctly handled as an asset URL and thus was
not correctly HTML or URL escaped. This created invalid HTML when
favicon URLs included query string arguments.
Refs #2233
2013-11-09 14:31:09 -05:00
ADmad
d647fe8a91
Added buffering of form tags generated by FormHelper::postLink()
2013-11-03 23:11:11 +05:30
mark_story
afd182898f
Merge branch 'master' into 2.5
2013-11-01 16:54:57 -04:00
Bryan Crowe
94d7ac1dd6
Correct spelling of retrieve
2013-10-30 23:13:07 -04:00
mark_story
aaac360833
Merge branch 'master' into 2.5
2013-10-30 14:58:20 -04:00
mark_story
525efcb808
Remove use of deprecated constants.
...
Fixes #2232
2013-10-29 17:49:16 -04:00
ADmad
d9ca148499
Merge branch 'master' into 2.5
...
Conflicts:
CONTRIBUTING.md
lib/Cake/Model/Model.php
lib/Cake/VERSION.txt
2013-10-30 02:34:09 +05:30
José Lorenzo Rodríguez
45bd01fdc0
Merge pull request #2132 from dereuromark/2.5-paginator-sort
...
Ability to use PaginatorHelper::sort() with only one direction.
2013-10-24 05:40:42 -07:00
Bryan Crowe
a943ea5c34
Add space between classname(s)
2013-10-22 22:59:50 -04:00
Bryan Crowe
d39ced8381
Correct 'an URL' to 'a URL' in docblocks
2013-10-22 00:09:34 -04:00
euromark
def015108d
Ability to use PaginatorHelper::sort() with only one direction.
2013-10-19 12:44:50 +02:00
Cameri
bb33d52cc6
Added 'xhr' as callback in JqueryEngineHelper::request() so it formats as Javascript.
2013-10-17 18:26:39 -04:00
Marc Würth
bf8a13a77c
Added binary type to field type map, defaulting to file input field
...
Refs https://github.com/cakephp/cakephp/issues/2071
2013-10-15 22:25:51 +02:00
Bryan Crowe
f9435aff27
Add missing return tags
2013-10-14 22:43:17 -04:00
Mark Story
ce74153389
Merge pull request #1691 from uzyn/2.5-decimal
...
Add support for decimal type in Schema.
Fixes #3171
2013-10-14 08:36:15 -07:00
Jose Lorenzo Rodriguez
df549898ad
Merge remote-tracking branch 'origin/2.5' into k-halaburda-master
2013-10-12 01:05:02 +02:00
Bryan Crowe
c1dd0e4393
Changed url to URL where appropriate
2013-10-07 23:17:58 -04:00
mark_story
60b0893c79
Merge branch 'master' into 2.5
2013-10-06 23:49:32 -03:00
ADmad
aa60b8791a
Fixed setting "required" attribute for file input. Closes #4124
...
In general fixed the issue where enabling SECURE_SKIP for a field
skipped "required" attribute check altogether. Instead now "required"
is set to false for hidden fields by default.
2013-10-04 20:35:38 +05:30
euromark
eb98770304
Remove leftover of pageTitle.
2013-10-04 00:35:56 +02:00
U-Zyn Chua
4806d09d7e
Setting of step for decimal field based on precision.
2013-09-29 22:44:50 +08:00
U-Zyn Chua
091658a752
Decimal support for FormHelper.
2013-09-29 22:40:35 +08:00
euromark
bd87ef45f2
complete autoLinkEmail()
2013-09-27 15:01:46 +02:00
euromark
205f7a504b
also fix autoLinkEmail()
2013-09-27 14:56:53 +02:00
euromark
2a954b6095
Make TextHelper::autoLink() work properly with umlauts.
2013-09-27 14:48:57 +02:00
Bryan Crowe
915b51b239
Updated JavaScript casing and JsHelper references in doc blocks
2013-09-25 22:46:38 -04:00
euromark
2455af09c5
Resolves ticket #4100
2013-09-25 14:01:35 +02:00
euromark
12f2f729c8
more cs
2013-09-17 14:53:07 +02:00
euromark
382f75dbfc
cs corrections, bool to boolean and int to integer.
2013-09-17 14:44:34 +02:00
mark_story
5ec9b145bf
Fix label element for attributes not matching their inputs.
...
Radio elements would contain ModelModelFieldValue instead of
ModelFieldValue like they should. This was caused by the fix for #3936
and lack of tests for create() + radio().
Fixes #4071
2013-09-16 22:38:28 -04:00
mark_story
3c9500a3cb
Fix whitespace error.
2013-09-05 10:21:24 -04:00
aread22
cb056a5cbe
Use FormHelper->label instead of HtmlHelper->useTag
...
Implementing suggested fix by mark_story
2013-09-04 13:32:36 -04:00
aread22
4ab1c8c225
Format to CakePHP code sniffs
2013-09-01 21:08:17 -04:00
aread22
64bb74a7e8
Potential Fix for LightHouse Ticket #3936
...
I believe I found a fix for this issue. I am here at #CakeFest2013 and during the #HourOfContribution I ran across this issue.
Currently in CakePHP 2.4 on Line 1522 - 1524 you can see the following code:
@@@ php
if ($label) {
$optTitle = $this->Html->useTag('label', $tagName, '', $optTitle);
}
@@@
The $label variable here the is the $label array passed into the input method in Sethathi example above. The problem is that the $label array is completely ignored and instead a label is created using the HtmlHelper->useTag method.
I have what I believe is a fix for this issue but it hasn't been extensively tested. I tested against Sethathi example in the ticket and it produced the correct result.
The fix is simple. We detect if an array is passed in and then send it to the FormHelper label method instead of the HtmlHelper useTag method. The FormHelper label methods accepts an options array, so we pass in the $label array.
This will probably need to be fixed for checkbox also
"ask":https://cakephp.lighthouseapp.com/users/235987 helped me with this fix
2013-09-01 20:56:44 -04:00
euromark
361980fade
remove code, class names and paths from translation strings.
2013-08-21 00:05:53 +02:00
mark_story
0f2d59d987
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Network/CakeResponse.php
lib/Cake/TestSuite/CakeTestCase.php
2013-08-18 23:10:08 -04:00
euromark
6cf147e8c8
unify null checks - avoid method call in favor of strict check
2013-08-16 20:12:49 +02:00
dmromanov
56ef44f495
Excluded method names from several tanslation strings
...
Removed unnecessary sprintfs
2013-08-16 13:42:28 +04:00
Alexander Hofbauer
80e589f19d
Correctly encode confirm handlers
...
With encode set to false the onclick handler will be sent through
h() regardless, making links and postLinks work again.
2013-08-13 10:11:22 +02:00
euromark
f3018cc532
refactor methods to avoid else block on returning early
2013-08-12 19:06:34 +02:00
José Lorenzo Rodríguez
890d4a9e2c
Merge pull request #1478 from aleho/2.4
...
Use a protected method to generate confirm() links
2013-08-11 13:51:29 -07:00
euromark
fc2d28974b
remove undocumented code and uncessary in_array() checks + cleanup
2013-08-08 03:56:58 +02:00
ADmad
faa4262969
Merge pull request #1305 from jrbasso/2.4-fix-asset-full-url
...
Fixed full urls on asset methods
2013-08-07 10:29:11 -07:00
Mark
6c30851783
Merge pull request #1424 from dereuromark/2.4-form-helper-datetime-rounding
...
provide ability for rounding - closes #1986
2013-08-07 10:15:35 -07:00
Alexander Hofbauer
8601e0078a
Implement a Helper method to generate confirm() links
...
This allows for overriding the default behavior of showing
confirm()-dialogs in Html and Form helpers.
2013-08-06 10:04:44 +02:00
ADmad
38b050a711
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
Juan Basso
316c6582ea
Fixed pathPrefix for css and script methods
2013-08-03 10:36:19 -04:00
ADmad
61bf8df454
Renaming base url config keys and methods for better uniformity.
2013-08-01 00:44:36 +05:30
ADmad
b22b39f158
Deprecate constants IMAGES_URL, CSS_URL, JS_URL and add corresponding config values instead.
2013-07-31 18:31:26 +05:30
Mark Story
4c7bc11a08
Merge pull request #1461 from thegallagher/master
...
Required fields not recognised by FormHelper when only using ModelValidator::add()
2013-07-29 18:33:28 -07:00
David Gallagher
bce0eb37b4
Don't need to check for empty because Model::validator() returns an interator
2013-07-30 11:09:43 +10:00
ADmad
a691e70065
Docblock and return type fixes
2013-07-29 19:13:31 +05:30
David Gallagher
5937685817
Use ModelValidator::count() to count dynamiclly added validation rules
2013-07-26 22:44:59 +10:00
Phally
32b818d2d8
Fixes bug in the first link of PaginatorHelper::numbers().
...
The link was the current URL instead of a link to the first
page. This only happened with named parameters. This commit
also includes a test for querystring parameters.
Refs #1432 .
2013-07-18 19:32:41 +02:00
euromark
05415dd83f
do not display page:1 or ?page=1 to avoid duplicate content in paginator helper output
2013-07-17 00:45:27 +02:00
euromark
b412e2cbb1
provide ability for rounding - closes #1986
2013-07-16 15:42:08 +02:00
Phally
e35bd80dfb
Adds option to multiply decimal percentages. Fixes #3814
2013-07-10 14:37:57 +02:00
ADmad
4ded269549
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
lib/Cake/VERSION.txt
2013-07-07 12:22:12 +05:30
Marc Würth
11eeb33644
Some minor CS improvements to FormHelper
...
Replaced use of deprecated method getVar by get.
Improved DocBocks, mostly data types
Removed deprecated DocBock tag because it's an invalid use of such. This makes the method look like it was deprecated but in reality it's only one of the possible values of one of its parameters.
2013-07-06 19:04:06 +02:00
euromark
c989624f80
whitespace coding standards
2013-07-05 14:15:18 +02:00
mark_story
c597855fe4
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Network/CakeRequestTest.php
2013-07-03 14:21:09 -04:00
euromark
f389435bae
coding standards and else block simplification
2013-07-03 19:27:17 +02:00
euromark
a90cb29c0f
simplify else cases
2013-07-03 01:14:41 +02:00
euromark
7cb19b97db
coding standards and simplification of else cases as well as some minor fixes
2013-07-03 00:52:48 +02:00
mark_story
f09693f6e8
Merge branch 'master' into 2.4
2013-06-29 23:26:26 -04:00
ADmad
75e7797a26
Allow escaping only attributes of a link and not it's title
2013-06-29 20:51:52 +05:30
euromark
ee5e8c95dd
fix issue with FormHelper and undefined variable and extract
2013-06-25 12:11:10 +02:00
euromark
d6c25bd0e3
add convenience method param() for PaginatorHelper
2013-06-24 00:03:08 +02:00
mark_story
dcf7df39d2
Merge branch 'master' into 2.4
2013-06-21 17:47:37 -04:00
mark_story
68db74d32d
Cleanup from previous commit.
...
Refs #GH-1352
2013-06-19 15:06:51 -04:00
Lucas Machado
dc3f9113b0
Fix to the date input year field
...
Create the field if no value is informed only to the maxYear and not to
the current date.
2013-06-19 15:05:15 -04:00
euromark
eb13242680
assert proper array access for _dateTimeSelected()
2013-06-18 09:39:43 +02:00
ADmad
12da3b1f27
Merge branch 'master' into 2.4
2013-06-16 13:07:44 +05:30
mark_story
111bfa43d4
Fix incorrect autolinking when urls end at HTML tags.
...
Fixes #3879
2013-06-15 22:01:29 -04:00
Mark Story
e454f2d2a3
Merge pull request #1334 from thegallagher/2.3-cache-fix
...
Fix content-type header in cached views.
Fixes #2358
2013-06-12 18:27:42 -07:00
euromark
b5b8885096
doc block formhelper postLink
2013-06-12 18:14:02 +02:00
ADmad
636cc8c103
Merge branch 'master' into 2.4
2013-06-09 18:08:32 +05:30
David Gallagher
0eead76d4b
Fix content-type header in cached views. Fixes issue #2358
2013-06-06 23:33:51 +10:00
ADmad
3303a2cda1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
Saleh Souzanchi
ca44413689
fix Form::_selectOptions, when disabled attribute is not array so do not be disabled item of options
2013-06-01 14:16:23 +04:30
Marc Würth
4c9f0414cb
Improved the DocBlocks and other code cleanup
...
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
ADmad
36c592e72e
Merge branch 'master' into 2.4
2013-05-26 11:23:53 +05:30
Gilles Wittenberg
6d996d52ce
Allow setting different type on scriptStart + scriptEnd
2013-05-21 20:14:44 +02:00
Gilles Wittenberg
f19615a3be
Allow setting different type on scriptBlock
2013-05-21 20:14:44 +02:00
Michael Tuttle
0d082b599a
changed HtmlHelper::tag() just return $text when empty($name)
2013-05-20 17:36:51 -06:00
Michael Tuttle
12462b2e51
make HtmlHelper::tag() just return the $text content with no wrapping tag when $name === false
2013-05-19 22:00:27 -06:00
mark_story
72b75660e5
Merge branch 'master' into 2.4
2013-05-16 21:31:27 -04:00
mark_story
f7d106a386
Fix FormHelper::tagIsInvalid with saveMany forms.
...
When saving multiple records validation errors were not correctly shown.
Fudge the entity path so it matches the validation errors set in the
models.
Fixes #3828
2013-05-13 21:09:31 -04:00
mark_story
cdede82b7e
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Core/Object.php
2013-05-07 22:22:48 -04:00
ADmad
91319bbe7b
Fix disabled attribute check.
...
Fixes #3818
2013-05-08 01:43:27 +05:30
Matt Creenan
3c46b8a491
Fix typo in link to cakephp book documentation
2013-05-06 13:00:06 -03:00
ADmad
a10275fb8b
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
2013-05-05 14:36:46 +05:30
mark_story
df8f5e8f84
Add additional entropy to postLink()
...
This should help make more uniq id's for postLinks that are created
sequentially.
Fixes #3807
2013-05-01 09:46:57 -04:00
mark_story
41d124d4de
Fix autoLinkUrls() not autolinking URL's without a /.
...
Refs #GH-1259
2013-04-30 17:02:07 -04:00
euromark
6b015d9771
fix select hours for 0/12
2013-04-30 14:54:09 +02:00
euromark
fab5a6f4d9
spelling corrections
2013-04-30 14:11:50 +02:00
euromark
09d9efe235
spelling corrections (a url to an URL, unify URL)
2013-04-29 11:05:17 +02:00
ADmad
e11d0f829a
Added html5 required attribute for select tags too
2013-04-27 18:39:53 +05:30
ADmad
8135d405a3
Merge branch 'master' into 2.4
2013-04-27 18:39:30 +05:30
euromark
67cc7f66da
dont add required class on wrapper div
2013-04-26 15:41:35 +02:00
ADmad
06a5c509c0
Merge branch 'master' into 2.4
2013-04-21 19:15:55 +05:30
mark_story
64da4e75c4
Remove silly code.
...
Changing the 12'th hour into 0 shouldn't be done when figuring out the
meridian, it makes sorting things out later more complicated. Remove
some duplicated code.
2013-04-20 14:48:54 -04:00
mark_story
f6c3015705
Add additional tests and fix incorrect meridian selection
...
When dates around midnight were used with interval + 12hr formats, the
incorrect meridian was selected.
Refs #GH-1237
2013-04-20 14:39:47 -04:00
ADmad
79ad8ab95a
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Utility/File.php
2013-04-14 00:05:18 +05:30
mark_story
ed435870ae
Fix secure field lists when select elements have custom name attributes.
...
When a select element had a custom name attribute the secured field name
was incorrect.
Fixes #3753
2013-04-12 12:30:05 -04:00
ADmad
548cccbbe2
"maxlength" is not a valid attribute for input element of type "number" in html5.
2013-04-11 21:06:52 +05:30
mark_story
5c83bc177d
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/VERSION.txt
2013-04-09 22:09:56 -04:00
mark_story
c77c7a7347
Fix warning with FormHelper::inputs()
...
introspectModel() can return non-array data sometimes. Casting avoids
warnings when forms are generate for models with no or faulty schema()
methods.
Refs #3602
2013-04-09 21:46:51 -04:00
ADmad
e55877d171
Merge branch 'master' into 2.4
2013-04-06 00:57:46 +05:30
mark_story
d8d8e9644d
Fix array('disabled') and array('disabled' => true) working differently.
...
The shortform should work the same as the longer form with regards to
disabling field locking with SecurityComponent.
Fixes #3734
2013-04-03 12:46:39 -04:00
Andreas Kristiansen
8bc7bc9bb1
Fixing comment for in TimeHelper __construct
2013-04-03 12:54:42 +02:00
ADmad
d809b1480e
Fix CS errors
2013-04-01 02:16:52 +05:30
mark_story
3fc627c5f8
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Error/ErrorHandler.php
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
lib/Cake/View/Helper/HtmlHelper.php
2013-03-30 22:12:27 -04:00
Renan Gonçalves
96c9174ee2
Fixing tag generation for Html::script() and Html::css() when using 'fullBase' => true.
...
Changing values on array_diff_key() from empty ('') to null as they have no consequences and offer better readability.
2013-03-29 15:24:08 +01:00
Mark
42ea6895b2
Merge pull request #1107 from TeckniX/patch-1
...
Added autoParagraph functionality to 2.4 Branch
2013-03-28 03:30:15 -07:00
mark_story
041c2d289f
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Shell.php
2013-03-26 20:31:54 -04:00
Loki
d260f4a5b3
Added autoParagraph to TextHelper with proper test cases and made it non-static
2013-03-25 11:00:37 -04:00
mark_story
2f79996140
Remove unused code and remove strict type checks.
...
Remove some unused code around manipulating hours. Also allow the
timeFormat option to be specified as either a string or an int. Both
types should be accepted and treated as equivalent.
2013-03-18 21:38:02 -04:00
Graham Watson
e38892ff06
Change equal operators to identity operators
2013-03-18 13:34:14 -03:00
Graham Watson
2ac545291a
Fix incorrect default meridian
...
Forgot to remove a line
2013-03-14 16:58:13 -03:00
Graham Watson
ec56d828b0
Fix incorrect default meridian
...
Prevent the default meridian from being changed from 'pm' to 'am' when the default time is in a 12-hour format between 1:00pm and 11:59pm and both a minute interval and default minute value are specified.
2013-03-14 16:48:12 -03:00
mark_story
0900c32c03
Merge branch 'master' into 2.4
2013-03-13 21:01:03 -04:00
mark_story
f1d192f282
Fix issue with midnight hour & 12hr formats.
...
No hour would be selected in the case of 12hr formats and a time like
00:xx:yy
2013-03-13 20:56:04 -04:00
mark_story
8209097bc3
Merge branch 'master' into 2.4
2013-03-09 12:40:59 -05:00
Mark Story
69f416da1e
Merge pull request #1165 from cakephp/master-year-range
...
Fix FormHelper year range for ranges outside of 1901-2038
2013-03-05 17:36:47 -08:00
euromark
a07c9f0c3c
Fix FormHelper year range for ranges outside of 1901-2038
2013-03-05 22:11:23 +01:00
Adam Taylor
433dd09ec4
Fix typos
2013-03-05 00:05:14 -07:00
mark_story
4b13e0a5f2
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-03-04 21:55:29 -05:00
Renan Gonçalves
fd72f894ad
Expanding year range based on the provided value.
...
This solves issues where editing a record with a year outside the year range would leave the year selection empty, as now it will expand to accomodate the value.
2013-03-01 13:45:55 +01:00
mark_story
d1c88ebf8a
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Log/Engine/FileLog.php
lib/Cake/Utility/Validation.php
lib/Cake/View/Helper/HtmlHelper.php
2013-02-24 20:24:26 -05:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01:00
ADmad
13029cc2bc
Merge branch 'master' into 2.4
2013-02-09 02:20:16 +05:30
Graham Weldon
26a08c6780
Updated copyright
2013-02-08 21:28:17 +09:00
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
euromark
d522f412db
Fix disabled elements as array for multiple select and make in_array() work properly here, fix same in_array issues for radio elements and move tests correctly - #1105
2013-02-07 15:36:00 +01:00
ADmad
0b46b042b9
Changed params for HtmlHelper::css() to be consistent with HtmlHelper::script().
...
Closes #3593
2013-02-05 23:22:24 +05:30
euromark
ee08fe5c1f
BC fixes for disabled checkboxes
...
see: d504642
see: #3545
Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
2013-01-31 09:44:35 +07:00
Rachman Chavik
1cb24384cd
Merge branch '2.2'
2013-01-31 09:42:55 +07:00
euromark
d504642c9b
BC fixes for habtm. Closes #3545 .
...
Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
2013-01-30 21:11:41 +07:00
mark_story
78b23d8e31
Fix issue with inputs() and plugin models.
...
inputs() should not trigger errors when generating inputs for plugin
models. Previously the internal state of FormHelper was incorrect as
model() returned the plugin name instead of the modelname.
Fixes #3571
2013-01-29 22:02:21 -05:00
ADmad
422ceaff85
Added "tel" and "email" input type guessing.
...
Closes #3557
2013-01-27 08:59:54 +05:30
mark_story
4af6039107
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
mark_story
ce7f85abe8
Fix Token fields being added to GET forms.
...
They are not used so there is not much point in appending them.
Fixes #3565
2013-01-25 15:21:16 -05:00
Mark Story
bc4db91b51
Merge pull request #864 from dereuromark/2.3-radio-multiple-between
...
allow between to be an array of strings
Fixes #2859
2013-01-25 12:06:55 -08:00
mark_story
e4f241dd23
Merge branch 'pr-1075'
...
Merge changes in pull request 1075.
2013-01-23 21:19:53 -05:00
ADmad
82f34c4cb3
Don't set "required" attribute for checkboxes (unless explicitly specified).
...
Adding it prevents user from submitting form with checkbox unchecked when the "boolean" validation rule is specified for the field.
Closes #3560
2013-01-23 20:38:24 +05:30
ADmad
db8127626a
Update helper usage to 2.x style in code examples
2013-01-19 13:15:33 +05:30
johnymonster
84b10ba707
Strict in_array for mixed id variable types
...
Setting the in_array check to strict, as this would return true
incorrectly when and if values are of mixed type.
2013-01-17 14:14:12 -05:00
euromark
11a88042bd
fix doc block endings
2013-01-11 15:06:54 +01:00
mark_story
d0d13acaf4
Merge branch 'master' into 2.3
2013-01-08 20:15:46 -05:00
mark_story
3f21d09c1d
Fix radio() and boolean values.
...
Boolean values should be cast to integer equivalents, which allows
for correct handling of boolean columns and their string equivalents
used in form options.
Fixes #3512
2013-01-07 21:12:53 -05:00
mark_story
75f654b87b
Fix double encoding in JsHelper request methods.
...
The urls were being HTML & URL encoded, this causes issues with URL's
containing query string parameters. Remove HTML entities as they aren't
required in the Javascript context.
Fixes #3495
2013-01-02 23:09:37 -05:00
ADmad
367463f4c1
Added disabledTag
option.
...
Closes #3108
2012-12-24 20:48:44 +05:30
Ceeram
3f4d24bfc0
remove unused local variables and a few improvements
2012-12-23 13:53:13 +01:00
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
ADmad
8ef2c22c29
Added "required" attribute to input element based on validation rules for field
2012-12-21 23:20:40 +05:30
mark_story
554d5794ce
Merge branch 'master' into 2.3
2012-12-19 21:18:52 -05:00
ADmad
d16a9ab98e
Fix error when no model scope is set
2012-12-20 02:32:24 +05:30
ADmad
1612bdf250
Fix docblock
2012-12-20 01:54:09 +05:30
ADmad
4fe85fc3c5
Fix docblock
2012-12-20 01:22:09 +05:30
José Lorenzo Rodríguez
6af78c15df
Merge pull request #1031 from krolow/ticket-2495
...
Paginator Sort, displaying related model field more friendly
2012-12-18 00:50:12 -08:00
Mark
8febb71b67
Merge pull request #1003 from dereuromark/2.3-cache-prefixes
...
cache prefix for view cache to avoid collisions with domains/languages
2012-12-17 00:46:08 -08:00
Vinícius Krolow
00ea427383
When you are showing a related model field in paginator sort it will display more friendly. eg: $this->Paginator->sort('Text.label') will retorn as Text Label
2012-12-17 01:55:03 -02:00
Mark Story
408f9dd3b0
Merge pull request #1018 from dereuromark/2.3-postlink-target
...
Put target attr on correct element when using postLink()
2012-12-15 06:58:14 -08:00
mark_story
6f5ff4d7dd
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
2012-12-13 20:20:42 -05:00
euromark
ae7f629eff
correct target attribute for postLinks
2012-12-12 11:23:41 +01:00
euromark
32f2426001
cache prefix for view cache to avoid collisions with domains/languages
2012-12-11 12:54:16 +01:00
Ceeram
2d908885c8
adding short descriptions in docblock
2012-12-10 10:55:22 +01:00
Ceeram
a15481bbe9
starting refactor Form->input
2012-12-10 10:51:39 +01:00
mark_story
2a8ebcea60
Exclude value attribute from generated file inputs.
...
Having a value attribute present causes HTML validation errors in HTML5
doctypes. It has no effect in other doctypes, and excluding it is always
valid.
Fixes #3440
2012-12-09 13:31:01 -05:00
mark_story
8a77a31620
Set translations to use the cake domain.
...
Core classes should be using either the cake, or cake_dev domain.
Fixes #3443
2012-12-09 13:25:00 -05:00
José Lorenzo Rodríguez
dc370826af
Merge pull request #918 from bar/2.3-form-empty-error
...
Calling Form->input() with 'errorMessage'=> false should trigger field error, but not render error element.
2012-12-01 13:09:35 -08:00
ADmad
72d6ca636f
Docblock fixes
2012-11-29 04:36:29 +05:30
ADmad
165035faa8
Merge pull request #963 from sarce/paginator-tag
...
prev() and next() methods of PaginatorHelper now possible to place the 'tag' option to 'false' for disable the wrapper.
2012-11-18 22:41:10 -08:00
mark_story
c504fcfdf0
I'm a tool, fix test and remove debug().
2012-11-17 14:57:03 -05:00
mark_story
a3ddff4aa7
Fix failing test & simplify code.
2012-11-17 14:51:57 -05:00
Mark Story
c752b75904
Merge pull request #958 from planardothum/feather
...
Frameworks compatible Breadcrumbs.
2012-11-17 11:23:43 -08:00
Sebastián Arce
d0d15701b3
prev() and next() methods of PaginatorHelper now possible to place the 'tag' option to 'false' for disable the wrapper.
2012-11-17 15:26:08 -03:00
Ber Clausen
1c281c9a2b
Calling Form->input() with 'errorMessage'=>false should trigger field
...
error, but not render error message (HTML element).
2012-11-16 15:02:01 -03:00
planardothum
bed9ba22cc
Fix spaces around operators.
2012-11-15 20:15:49 -05:00