Commit graph

365 commits

Author SHA1 Message Date
planardothum
f078715d8e Merge branch 'master' of https://github.com/planardothum/cakephp
Conflicts:
	lib/Cake/View/Helper/HtmlHelper.php
	lib/Cake/View/Helper/PaginatorHelper.php
2012-11-13 19:53:57 -05:00
Harold Putman
77886a9c5b Merge remote-tracking branch 'upstream/master' 2012-11-13 17:18:00 -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
Harold Putman
6f238a4048 Framework-compatible breadcrumbs
Add new options to getCrumbList to allow it to be used to make
breadcrumbs in Twitter Bootstrap or Zurb foundation. Follows the model
of PaginatorHelper
2012-10-02 08:39:25 -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
Harold Putman
ed2f7013c9 More Flexible Paginator
Zurb foundation expects pagination links wrapped in anchor tags <a>
even on the current page. This seems like a safer approach.
2012-10-01 14:20:49 -04:00
Harold Putman
b034d9d869 Twitter Bootstrap Compatibility
Wrap inactive elements in span (current page, prev/next buttons at ends
of range).
2012-10-01 12:14:57 -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
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