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
ADmad
f7e66da6fc
Fix derpness of fieldset
and legend
options being mashed inside $fields param array.
2012-11-15 11:22:04 +05:30
mark_story
a7f192c606
Merge branch 'master' into 2.3
2012-11-14 21:50:29 -05:00
mark_story
58de6702bc
Fix notice errors when creating fields named 0.
...
Fixes #3371
2012-11-14 21:27:12 -05:00
planardothum
a0f323eb4c
Add frameworks compatible Breadcrumbs.
...
New options in HtmlHelper::getCrumbList() to make it compatible with Twitter Bootstrap, Zurb foundation or other CSS frameworks.
2012-11-13 20:19:29 -05:00
mark_story
60f9626838
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-02 16:52:51 -04:00
ADmad
26d8351af4
Fixing "required" field detection again. Closes #3305
2012-11-01 05:04:37 +05:30
mark_story
c24bec679b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/View/Helper/FormHelper.php
2012-10-27 21:13:53 -04:00
euromark
0f978195d6
coding standards regarding whitespaces
2012-10-27 00:46:12 +02:00
Ceeram
f4f4aa4a2a
Squashed commit of the following:
...
commit 22311a1e62934da757d53d7aecfce884f5a1ca10
Merge: fda331e d051b69
Author: Ceeram <c33ram@gmail.com>
Date: Fri Oct 26 14:40:24 2012 +0200
Merge branch '2.3' into currency
commit fda331eab169068763717f88838032b7c0c02c29
Author: Ceeram <c33ram@gmail.com>
Date: Sun Oct 7 23:53:03 2012 +0200
NumberHelper now also uses the default currency from CakeNumber, instead of default argument value
commit 967bf8e27ea2438f1972390b7ef78ae62e17a762
Author: Ceeram <c33ram@gmail.com>
Date: Sun Oct 7 18:01:35 2012 +0200
Adding feature to set default currency on CakeNumber, to make repetetive calls to CakeNumber::currency() more DRY
2012-10-26 19:32:39 +02:00
ADmad
0ddd130833
Improved "required" field detection. Closes #3305 .
2012-10-26 12:58:24 +05:30
mark_story
50a4b792be
Clean up code in FormHelper::dateTime()
...
Remove $$ variables and split a huge method into smaller pieces.
2012-10-25 21:28:01 -04:00
mark_story
c359e4b689
Fix issue with array based values and interval.
...
Fixes #3299
2012-10-25 20:46:54 -04:00
Mark Story
555bfc32ea
Merge pull request #909 from dereuromark/master-magic-input-bc
...
Master magic input bc
Fixes #3295
2012-10-25 07:05:31 -07:00
dogmatic69
641ba9f3e6
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
2012-10-24 19:03:44 +01:00
mark_story
d2010308d4
Merge branch 'master' into 2.3
2012-10-23 20:20:52 -04:00
euromark
2ac08bf024
fix whitespace
2012-10-23 19:04:52 +02:00
mark_story
3729ac1f2f
Fix issue where the incorrect meridian would be selected.
...
When combining 12 hour format, interval and afternoon times, the
incorrect meridian would be selected. Moving the hour math into
FormHelper::hour() makes that method generally more correct and lenient
on its input.
Fixes #3299
2012-10-23 12:47:12 -04:00
euromark
5064601c6f
adding test case
2012-10-23 15:11:23 +02:00
euromark
9a9ac6f3a7
allow input type=number to also be magic
2012-10-23 15:11:22 +02:00
mark_story
f457f07b5c
Force field validation to use sha1
...
When using blowfish as your application's hashing strategy, form field
validation would fail horribly. Forcing sha1 fixes this and restores
behavior consistent with 2.2.x
Fixes #3280
2012-10-18 21:26:26 -04:00
mark_story
1aea9ac0c9
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Event/CakeEventManager.php
lib/Cake/VERSION.txt
lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04:00
Adam Taylor
4090c2e932
Remove trailing whitespace from comments
...
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06:00
ADmad
56a0eb04b7
Fix incomplete patch 61dd1098d3
2012-10-14 18:44:10 +05:30
ADmad
61dd1098d3
Allow specifying tag for current page number. Closes #2892
2012-10-13 12:34:00 +05:30
ADmad
8bc17996dc
Update docblock
2012-10-11 20:00:30 +05:30
mark_story
b1dfab87e4
Fix autoLinkUrls so it re-capture query strings.
...
Fixes #3296
2012-10-11 08:28:59 -04:00
mark_story
a3ae58da09
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/View/View.php
2012-10-01 21:20:25 -04:00
dogmatic69
408e619c9f
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
mark_story
80c355baa5
Make minutes/hours wrap around correctly.
...
Also account for times around midnight that roll over days/months/years.
Fixes #3242
2012-09-28 22:50:46 -04:00
euromark
b47e3a7d92
move charset/App.encoding into CakeResponse
2012-09-27 20:28:19 +02:00
Jose Lorenzo Rodriguez
d5c9d97dc1
Merge remote-tracking branch 'origin/master' into 2.3
...
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
dogmatic69
36314e6d37
converting if ($foo != "") to if ($foo)
2012-09-21 23:34:37 +01:00
dogmatic69
8dc4de5de8
converting if ($foo != false) to if ($foo)
2012-09-21 23:32:52 +01:00
dogmatic69
b1f26b59a3
converting if ($foo != null) to if ($foo)
2012-09-21 23:30:43 +01:00
euromark
bfaed32e58
allow between to be an array of strings
2012-09-21 00:06:26 +02:00
mark_story
0f0b5e7668
Fix incorrect radio selection with falsey values.
...
Use strval() to work around 0 == '' type issues.
Cleanup some tests.
Fixes #3221
2012-09-19 10:14:29 -04:00
mark_story
5d830d7adb
Fix multiple selects always failing post validation.
...
Fixes #3218
2012-09-18 14:41:51 -04:00
Dave
46035cfd73
Update lib/Cake/View/Helper/FormHelper.php
2012-09-18 10:56:36 -03:00
Dave
990d5f89f0
Update lib/Cake/View/Helper/FormHelper.php
2012-09-18 10:51:24 -03:00
dogmatic69
a38a616cba
changing join() to implode() for consistency
2012-09-15 11:06:02 +01:00
dogmatic69
5cc03ca805
converting if($foo == true) to if($foo)
2012-09-14 18:54:29 +01:00
dogmatic69
22a2e1b51e
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
2012-09-14 18:42:25 +01:00
dogmatic69
cf8fccae96
converting $foo == null / $foo == false to !$foo
2012-09-14 18:26:30 +01:00
dogmatic69
6f3e6c10a1
Adding a check to the object before use
...
For some reason that I have not been able to figure out yet the object is
returned as null. This is causing some exceptions when trying to access
properties that dont exist.
FatalErrorException: "Call to a member function getAssociated() on a non-object"
Test still pass with the added check.
2012-09-14 14:54:10 +01:00
euromark
288fb120b5
added missing App::uses('Hash', 'Utility');
2012-09-13 17:20:26 +02:00
mark_story
cf4a9f420f
Tidy doc block.
2012-09-12 22:56:46 -04:00
mark_story
99a9cc9669
Fix required field detection.
...
Fix required field detection to match documentation and behavior when
validating. Having `allowEmpty` in the first validation rule, makes the
field not 'required' as the field is allowed to be empty.
Fixes #3194
2012-09-11 21:59:46 -04:00
mark_story
2bbf6bd568
Forward model option to PaginatorHelper::link().
...
Fixes #3193
2012-09-11 21:47:41 -04:00
Kyle Robinson Young
bc40ac7d3f
Remove unused variables and code
2012-09-05 17:19:13 -07:00
ADmad
28951865c6
Hidden divs created by FormHelper can now be customized.
2012-09-04 23:56:30 +05:30
mark_story
771cfde196
Fix coding standards.
2012-09-03 20:09:13 -04:00
brq
fca98e39f9
Allow postLink() to support other HTTP methods; it defaults to POST
2012-09-02 12:57:35 -05:00
mark_story
728300786b
Merge branch 'master' into 2.3
2012-08-30 19:43:11 +01:00
mark_story
4fdd5e5d45
Ignore non-scalar values for length.
...
Fixes #3159
2012-08-28 21:58:32 -04:00
mark_story
cbb64bd082
Fix blackhole requests with empty select boxes.
...
When a select box was entirely empty (no option element)
secured form submission should not fail.
Fixes #3153
2012-08-26 22:53:48 -04:00
mark_story
d66d37c92b
Merge branch 'master' into 2.3
2012-08-24 22:50:29 -04:00
mark_story
88604ac757
Replace is_a with instanceof.
2012-08-21 08:47:58 -04:00
mark_story
c83e941497
Merge branch 'master' into 2.3
2012-08-15 21:00:49 -04:00
ADmad
4a483b4897
If cache is disabled in app and js cache file is not written don't return script tag with file url.
...
Instead return script block with inline js content.
2012-08-12 01:08:05 +05:30
mark_story
e59555a66f
Merge branch 'master' into 2.3
2012-08-03 22:45:56 -04:00
mark_story
e620433680
Update doc block.
2012-08-02 21:35:06 -04:00
mark_story
e38c149880
Decompose complex nested conditionals.
...
Refs #808
2012-08-02 21:35:06 -04:00
euromark
a208eb6cb1
fixes disabled attribute for multiple checkboxes
2012-08-02 21:35:05 -04:00
mark_story
9b94133f0d
Fix uncaught exceptions when generating view cache files
...
Fixes #3016
2012-07-30 21:27:21 -04:00
mark_story
7b939186a1
Fix ( and ) not being correctly handled by autoLinkUrls
...
Fixes #3077
2012-07-29 21:18:33 -04:00
Schlaefer
19f0e72d58
fix #2858 RSS helper bug with namedspaced keys
...
http://cakephp.lighthouseapp.com/projects/42648/tickets/2858-rss-helper-bug-with-namedspaced-keys
2012-07-29 14:24:46 +02:00
mark_story
d94cdc67fe
Merge branch 'master' into 2.3
2012-07-27 22:38:24 -04:00
ADmad
99813e97b3
Implemented feature to allow individual "empty" values for date time select elements
2012-07-28 01:47:21 +05:30
mark_story
3c6b50953b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-07-18 22:12:51 -04:00
euromark
3945c0e6a8
rtim files
2012-07-18 03:55:29 +02:00
Jose Lorenzo Rodriguez
db247558b0
Correctly passing ellipsis options to all internal method calls insie
...
PaginatorHelper::numbers(), under some combinations of modulus/limit
it would not get passed even though there are pages in between to show
2012-07-10 20:46:56 -04:30
euromark
b32edfe378
fix double-encoding of external urls
2012-06-12 16:30:37 +02:00
Thiago Colares
6262a074f6
Breaking tableHeaders description in two lines
2012-05-30 09:34:10 -03:00
Thiago Colares
c65d4318cf
Enhancement in HtmlHelper > tableHeaders. Each tablename also can be a key that points to an array with a set of attributes to its specific tag
2012-05-29 23:28:57 -03:00
José Lorenzo Rodríguez
ed15634ccb
Merge pull request #663 from jellehenkens/api-docs-mixed-params
...
Updating @param mixed docblock lines to proper multi type @param's
2012-05-22 08:38:23 -07:00
Tigran Gabrielyan
671c31218f
Making FormHelper::inputDefaults() code more readable
2012-05-21 13:56:51 -07:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
Tigran Gabrielyan
57ad5e2573
Made FormHelper::inputDefaults() alawys return inputDefaults array
2012-05-20 15:51:48 -07:00
Tigran Gabrielyan
fd0dd7ec04
Updating FormHelper::create to use new inputDefaults() method
2012-05-20 13:44:54 -07:00
Tigran Gabrielyan
1d77ad393c
Added FormHelper::inputDefaults setter/getter method
2012-05-20 13:41:55 -07:00
Jose Lorenzo Rodriguez
2ad406ab64
Merge branch '2.2-validator' into 2.2
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-05-20 14:27:35 -04:30
Jelle Henkens
97ebbc8e23
Fixing coding conventions
2012-05-19 16:08:40 +01:00
Jelle Henkens
5fe22cfc8d
Adding support for DateTime objects in the CakeTime Utility class
2012-05-17 19:31:30 +01:00
mark_story
579aff5ad3
Fix error with options.
2012-05-12 22:35:49 -04:00
mark_story
176ec2df0c
Add documentation on additional options.
2012-05-12 22:26:34 -04:00
mark_story
0edbe0a123
Fix more whitespace.
2012-05-12 22:26:34 -04:00
mark_story
a80a7dadf8
Re-factor element generation.
...
Add the ability for arbitrary attributes.
Use built-in methods for attribute generation.
Add tests for element generation.
2012-05-12 22:26:33 -04:00
Magnus Johansson
352fbde2ec
Move out HTML logic to Helper/TimeHelper.php. The Utility/CakeTime.php timeAgoInWords() now returns a string with the time, while the same function in Helper/TimeHelper.php may return an HTML element.
2012-05-12 22:26:33 -04:00
Jose Lorenzo Rodriguez
fe659c0c33
Refactored FormHelper to take advantage of the new validator object
2012-05-10 23:14:26 -04:30
ADmad
d34f0c2bd8
CakeTime functions can now use timezone string or DateTimeZone object for user offsets. (Passing numeric offsets has been kept for BC)
2012-04-22 01:59:08 +05:30
mark_story
21ba5bf04a
Merge branch '2.1' into 2.2
2012-04-17 21:47:24 -04:00
mark_story
c871d85f2b
Fix introspection on models in other plugins.
...
Apply patch from 'Kim Biesbjerg'. Fixes issues introspecting
models in associations from different plugins.
Fixes #2732
2012-04-17 21:35:03 -04:00
mark_story
94e83fa81c
Fix invisible buttons.
...
Fixes #2802
2012-04-17 20:46:19 -04:00
mark_story
8eb913433f
Move _attributeFormat and _minimizedAttributeFormat down.
...
Both properties are referenced by Helper. The properties
should be declared there as well.
Fixes #2771
2012-04-13 07:48:09 -04:00
mark_story
9f9feec222
Merge branch '2.2-hash' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
mark_story
38b7ae3c67
Coding standards cleanup.
...
Fix coding standards
Simplify addition of empty.
Add doc block for new feature.
2012-04-06 21:47:02 -04:00
Clément Hallet
a7a55631d8
remove 'empty' option from once checked
2012-04-06 21:37:19 -04:00
Clément Hallet
00b2c49af2
FormHelper : use the empty option for radio buttons
2012-04-06 21:37:18 -04:00
Ceeram
c2a8fca00c
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
2012-04-05 23:27:21 +02:00
mark_story
5c590aad09
Add missing ClassRegistry import.
...
Fixes #2757
2012-04-05 08:33:12 -04:00
mark_story
475a1596b7
Merge branch '2.1' into 2.2
2012-04-01 15:37:21 -04:00
José Lorenzo Rodríguez
c67feb0629
Merge pull request #589 from shama/patch-substr-optimizations
...
substr() optimizations throughout core
2012-03-28 13:23:16 -07:00
Kyle Robinson Young
e2a46f76c7
substr() optimizations
2012-03-28 13:07:26 -07:00
ADmad
47558e8db5
Revert "Merge pull request #538 from mcammaert/2.1". Closes #2723
...
This reverts commit 96f73d6392
, reversing
changes made to 9d017c2b5c
.
Conflicts:
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
2012-03-29 01:33:21 +05:30
Jose Lorenzo Rodriguez
4f6f041730
Using same serialization strategy for request object in cached views, this prevents some failing tests in environments
...
with different charsets
2012-03-27 00:57:15 -04:30
mark_story
c1531d3faa
Fix a few small code standards issues.
2012-03-26 23:04:32 -04:00
mark_story
a76a926ac1
Fix more uses of Set -> Hash
2012-03-26 22:32:57 -04:00
mark_story
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
mark_story
69e63b11a4
Change method to only return true/false.
...
null/true/false is complicated. Fix issues with some
of the test fixtures. imalsonotrequired was actually required
as it's last rule didn't specify allowEmpty = true and had a range
validation rule.
2012-03-21 21:06:49 -04:00
Thomas Ploch
cabb0d00ac
Added support for 'on' validation key in FormHelper. Fixes #2169 .
2012-03-21 21:06:49 -04:00
mark_story
c54ac257f1
Fix getCrumbs() with no crumbs and first link.
...
Apply patch from 'Andy Hobbs' to fix issues with breadcrumbs, and
a starting breadcrumb.
Fixes #2689
2012-03-17 23:23:42 -04:00
Stefano Zoffoli
60b9cd80a0
Prevent blackhole auth error where are present multi fields (part 2)
2012-03-13 17:02:22 +01:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
mark_story
3a8c49e319
Add check for simple category elements.
...
Fixes #2655
2012-03-07 19:52:06 -05:00
mark_story
664b0538b8
Fix more coding standards problems.
2012-03-04 22:49:38 -05:00
mark_story
863aaad4e3
Update docs for GH-322
2012-03-04 09:59:40 -05:00
Mark Story
ca25e75852
Merge pull request #322 from ingk/2.1
...
FormHelper: Allow a boolean value for the disabled attribute in function radio
2012-03-04 06:51:02 -08:00
mark_story
50e7f4c995
Merge branch '2.0' into 2.1
2012-03-03 23:20:18 -05:00
mark_story
dde19f97c7
Fix sortDir() to read default params.
...
sortDir() also did not reflect the default paging parameters.
This would result in initial links not matching the query used.
Fixes #2640
2012-03-03 23:19:50 -05:00
mark_story
8f72b696a0
Fix sortKey() not looking at default params.
...
sortKey() only looked at the options values, which do not include
default sorting options declared as settings in the helper.
Fixes #2640
2012-03-03 23:06:45 -05:00
mark_story
acccdcde1f
Fix coding standard issues in View/
2012-03-03 17:10:12 -05:00
mark_story
7d51db9e63
Merge branch '2.0' into 2.1
2012-03-03 12:27:22 -05:00
Takayuki Miwa
1475e87b38
Update PaginatorHelper::beforeRender to merge request->query with url options
2012-03-03 13:46:46 +09:00
Jose Lorenzo Rodriguez
c84e25e5b4
Moving $_minimizedAttributes form HtmlHelper back into Helper, as _parseAttributes is using it
2012-03-01 14:56:56 -04:30
Manu Cammaert
cd2dca205c
default options are lost in case of eg. validation error
2012-02-28 23:39:16 +01:00
euromark
e94d307ee1
code conventions
2012-02-25 19:46:05 -05:00
Tigran Gabrielyan
95ba5f45a5
Keeping code dry in HtmlHelper::getCrumbs/getCrumbList
2012-02-21 11:38:13 -08:00
Mark Story
f138c73a77
Merge pull request #483 from tigrang/getCrumbList-enhancement
...
Added `startText` feature to HtmlHelper::getCrumbList()
2012-02-21 18:24:16 -08:00
Kyle Robinson Young
45ec5d73c5
Add missing visibility keywords
2012-02-16 23:13:12 -08:00
Majna
1dbafe1d4f
Fix docblocks.
2012-02-17 13:51:20 +01:00
Tigran Gabrielyan
af2fd03590
Added startText
feature to HtmlHelper::getCrumbList()
2012-02-16 19:17:43 -08:00
Mark Story
df0d1d681f
Merge pull request #479 from slygoncito/0dace174a79b87a2a196cc2bc94dbb009b705878
...
Option 'currentClass' always defaults to 'current'.
2012-02-15 20:05:50 -08:00
Slygoncito
0dace174a7
Option 'currentClass' always defaults to 'current'.
2012-02-16 00:11:43 -03:00
mark_story
27367b491a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
lib/Cake/View/Helper/TextHelper.php
2012-02-14 21:55:21 -05:00
Rachman Chavik
89d4b58073
fix indentation and add __construct() docblocks
2012-02-14 23:28:57 +07:00
Rachman Chavik
5eb1979b04
rename protected variable to $_engine
2012-02-14 23:28:57 +07:00
Rachman Chavik
fe479c636c
adding tests for engine overrides
2012-02-14 23:28:57 +07:00
Vinícius Krolow
07adcfe2f7
fixing regex of autoLinks to work with urls that have www
2012-02-14 11:08:37 -02:00
Rachman Chavik
d6fd051fb4
changing methods in CakeTime class to static
2012-02-14 09:34:36 +07:00
Rachman Chavik
9624c27ef4
changing methods in CakeNumber class to static
2012-02-14 09:34:36 +07:00
Rachman Chavik
abd6d22445
changing methods in String class to static
2012-02-14 09:34:36 +07:00
mark_story
afecb713ab
Make button type nullable.
...
Fixes #GH365
2012-02-13 21:00:57 -05:00
mark_story
2afb05b590
Merge branch '2.0' into 2.1
...
Conflicts:
app/View/Pages/home.ctp
lib/Cake/Config/config.php
lib/Cake/Core/App.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
Kyle Robinson Young
730ac10ae4
Add missing options to NumberHelper docblocks
2012-02-10 22:17:58 -08:00
ADmad
83e8d436f8
Fixing docbloc and adding tests for FormHelper::tagIsInvalid(). Refs #2562
2012-02-11 06:09:58 +05:30
Rachman Chavik
2dc9986fad
moving methods from TextHelper to String
2012-02-10 22:25:59 +07:00
Rachman Chavik
6fdaef10c8
moving NumberHelper to CakeNumber
2012-02-10 22:25:59 +07:00
Rachman Chavik
04cdef9126
moving TimeHelper to CakeTime
2012-02-10 22:25:59 +07:00
ADmad
e2b273e891
Renaming option type
to tag
to avoid potential conflict in future with html attribute.
2012-02-10 19:44:55 +05:30
ADmad
be694d8d6b
Allowed specifying media path using 'src' attribute
2012-02-10 13:06:55 +05:30
Tigran Gabrielyan
7fe6a4d5ea
Added Plugin.asset support for HtmlHelper css(), script(), and image() with tests
2012-02-07 20:20:50 -08:00
ADmad
c0690a3eff
Added reponse object as property of View class View::$response. Refactored HtmlHelper::media() a bit.
2012-02-06 20:45:00 +05:30
ADmad
c57275636c
Replacing HtmlHelper::video() with HtmlHelper::media() which can generate either audio or video element
2012-02-06 18:57:16 +05:30
ADmad
2f7f00daa2
"preload" is not a minimized attribute
2012-02-06 12:37:13 +05:30
ADmad
22220074f2
Added HtmlHelper::video() for html5 video element generation. Extracted asset url generation code to new function Helper::assetUrl().
2012-02-06 01:30:38 +05:30
ADmad
12bf1348f5
Merge branch '2.0' into 2.1
2012-02-05 17:55:46 +05:30
ADmad
b5c7ca2ee9
Added self closing tag format.
2012-02-05 17:43:23 +05:30
mark_story
94778ef673
Add block option to HtmlHelper::scriptBlock()
2012-01-31 22:20:21 -05:00
mark_story
a275555297
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/CakeSession.php
2012-01-29 15:38:56 -05:00
Tigran Gabrielyan
30d6341e7f
Fixed bug in CacheHelper where PluginAppController was not being loaded
...
Signed-off-by: mark_story <mark@mark-story.com>
2012-01-28 22:35:42 -05:00
Majna
d7b06194a4
Add option for 'current' class to PaginationHelper::numbers().
2012-01-28 18:24:28 +01:00
Ceeram
7eda0affe3
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/View/ThemeView.php
2012-01-26 21:40:18 +01:00
mark_story
5b9d69fcc8
Update image() docs.
2012-01-25 21:14:01 -05:00
Mark Story
7cfd27e7f6
Merge pull request #419 from radig/2.1
...
Fix HtmlHelper::link test and extend HtmlHelper::image (issue #2476 )
2012-01-25 18:05:56 -08:00
Kyle Robinson Young
f69edb5c80
Remove incorrect parameter in HtmlHelper::script docblock example
...
Fixes #76
2012-01-23 16:01:38 -08:00
mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
wnasich
c95ab282dc
Test case and Fix for: Number::currency() issue
...
Fixes currency() for custom formats and numbers between -1 and 1.
Fixes #2489
Conflicts:
lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
lib/Cake/View/Helper/NumberHelper.php
2012-01-19 21:07:27 -05:00
Cauan Cabral
03bac42366
Change fullPath option to fullBase in HtmlHelper::image for consistency
...
Updated test cases for that.
Included doc block about that option.
2012-01-18 08:32:40 -03:00
Cauan Cabral
90426674cb
Merge branch 'master' into 2.1
2012-01-17 23:18:54 -03:00
Cauan Cabral
0c0135ff5e
Option to return img src with fullpath address
2012-01-17 22:55:24 -03:00
AD7six
67f4fa0f20
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-15 01:03:48 +01:00
AD7six
22f844c48f
prevent block="css" when using inline=false css
2012-01-15 01:03:17 +01:00
mark_story
c89c49c310
Enhance HtmlHelper::getCrumbs() $startText param
...
It now accepts an array which gives more control and flexibilibity
over the first breadcrumb link.
Fixes #2475
2012-01-14 13:14:26 -05:00
Jose Lorenzo Rodriguez
fa99b58622
Ensuring the javascript provider class is loaded before checking method on it
2012-01-07 18:03:22 -04:30
mark_story
9562638610
Merge branch '2.0' into 2.1
2012-01-04 07:39:35 -05:00
mark_story
3e1c567f08
Remove duplicate methods.
...
Fix regression where #1345 was re-introduced.
Fixes #2434
2012-01-03 21:11:45 -05:00
mark_story
3478f8a627
Merge branch '2.0' into 2.1
2011-12-30 10:19:51 -05:00
Mark Story
a4e3790196
Merge pull request #387 from shama/patch-text-truncate
...
Prevent TextHelper::truncate() from breaking HTML
2011-12-30 07:15:35 -08:00
mark_story
23178df504
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-12-29 20:03:42 -05:00
Mark Story
7f46ede097
Add more complete api docs for label()
...
Fixes #2415
2011-12-27 10:08:54 -05:00
Kyle Robinson Young
acca796d10
Fix tag order when closing open tags with TextHelper::truncate()
2011-12-25 09:10:50 -08:00
Kyle Robinson Young
4e7e06fa9f
Prevent TextHelper::truncate() from breaking HTML
...
Fixes #2397
2011-12-24 21:25:07 -08:00
mark_story
2c0e030831
Move call to tagIsInvalid to FormHelper
...
tagIsInvalid() doesn't exist in Helper, and shouldn't be
called from that class.
Fixes #2411
2011-12-23 20:41:16 -05:00
ADmad
389072708a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
euromark
a41539dfa4
Indentation fix (tab instead of spaces)
...
Fixes #2398
Conflicts:
lib/Cake/Test/Case/Console/Command/ShellTest.php
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-20 22:26:43 -05:00
mark_story
c272a8b3ca
Update doc blocks.
2011-12-19 22:13:02 -05:00
mark_story
c13e6588f5
Datetime labels should point at the first input.
...
Label elements generated for datetime/date/time inputs should point
at the first generated input. Apply + update patch from MrRio.
Fixes #427
2011-12-19 22:09:46 -05:00
mark_story
866177f37d
Fix issue with link generation and no title.
...
Fix urlencoded text from being displayed in text of links.
Fixes #2387
2011-12-19 20:49:01 -05:00
Kyle Robinson Young
5225fe2b5c
Ability to set hiddenField value with FormHelper::checkbox
...
Fixes #1811
2011-12-18 23:34:19 -08:00
Kyle Robinson Young
c34bf673d5
Remove extra space in HtmlHelper radio tag
2011-12-18 09:40:23 -08:00
Kyle Robinson Young
c93dab69a3
Correct placement of between on FormHelper radio and input
...
Fixes #1992
2011-12-18 08:25:42 -08:00
mark_story
bcb8444ab1
Make CacheHelper able to handle nocache tags in elements.
...
Using afterRenderFile() instead of afterRender() allows
CacheHelper to parse content in elements and extended views.
2011-12-17 22:23:37 -05:00
mark_story
fb20841d25
Doing some internal re-factoring in CacheHelper.
...
cache() should only do one thing.
It shouldn't do more work than is necessary each time its called.
Flatten some of the conditions by extracting methods.
2011-12-17 22:23:37 -05:00
mark_story
dcf8c0fd04
Re-factoring duplicated code out.
2011-12-17 22:23:36 -05:00
mark_story
82139fe8f6
Updating HtmlHelper to allow custom blocks.
...
Adding tests for blocks.
Adding missing tests.
2011-12-17 22:23:34 -05:00
Mark Story
4606ea39a9
Updating HtmlHelper and its tests to use View::append().
2011-12-17 22:23:34 -05:00
mark_story
78325a13b9
Remove un-used variable.
...
Fixes #2382
2011-12-16 23:02:27 -05:00
Kyle Robinson Young
d794084d38
More code standards formatting
2011-12-15 23:00:07 -08:00
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08:00
mark_story
2e8498e166
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
mark_story
8bb6f8803c
Fix infinite loop when minYear/maxYear are not int.
...
Refs #2361
2011-12-11 22:11:14 -05:00
Kyle Robinson Young
c836ba08a3
Add/move docblocks to make text available in the API docs
2011-12-08 07:35:02 -08:00
ADmad
df097796c4
Fixing incorrect setting of default value for 'onDomReady' option in JsHelper::writeBuffer()
2011-12-08 14:03:39 +05:30
mark_story
64eb38a953
Fix disabled + SecurityComponent
...
Disabled inputs should be omitted from the secured fields.
This will enable forms to submit successfully as long as those
inputs stay excluded from the form submission.
Fixes #2333
2011-12-07 22:30:40 -05:00
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08:00
Kyle Robinson Young
7f22fcdbf5
Fix TextHelper excerpt method to work as documented
...
Fixes #2339
2011-12-05 12:12:09 -08:00
ADmad
72497147bd
Changing default docType to 'html5'
2011-12-05 07:04:00 +05:30
mark_story
457dd73ed0
Move viewVars assignment after callbacks.
...
Assigning the controller viewVars after callbacks
allows the controller callbacks to assign additional
viewVars, or manipulate existing ones.
Fixes #2335
2011-12-03 14:45:21 -05:00
mark_story
6d269ce25d
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
Kyle Robinson Young
8197f87dbc
Spelling and grammar fixes
2011-12-01 21:58:09 -08:00
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08:00
Kyle Robinson Young
5876744709
Adhering to coding standards
2011-11-30 07:44:11 -08:00
Kyle Robinson Young
1d50562931
Add @link to docblocks on Form, Html, Js, Paginator, Rss and Session helpers
2011-11-29 21:23:02 -08:00
teddyzeenny
803e7be363
Apply base64 encoding after helper serialization
2011-11-28 14:02:39 +02:00