Commit graph

732 commits

Author SHA1 Message Date
mark_story
7c2ec5b451 Merge branch '2.7' into 2.8 2015-12-27 10:51:41 -05:00
mark_story
72b98f58a8 Backport paginator changes for string integers.
Backport the intent of #7845 into 2.x. The implementation differs a bit
from 3.x but paginator helper internals are pretty different in both
branches.

Refs #7092
2015-12-26 22:52:57 -05:00
mark_story
48450e71fa Merge branch '2.7' into 2.8 2015-11-11 22:53:45 -05:00
Marc Würth
58316b3a58 Specify type hint
Plus fix two typos.
2015-10-27 16:47:48 +01:00
Mark Scherer
8287981855 Make sure direction values are lowercased to be consistent. 2015-10-26 23:20:30 +01:00
mark_story
7bf6768066 Merge pull request #7516 into 2.7
PaginatorHelper::meta() skips url parameters (passed and named) which
results in urls not respecting defined routes.  It means
PaginatorHelper::meta() does not generate same urls as
PaginatorHelper::prev() & PaginatorHelper::next().

Refs #7516
2015-10-10 22:31:15 -04:00
Marc Würth
ed410dd12c Do not mix void with other return types
Inspired by #7527
2015-10-10 15:49:00 +02:00
Mohsen
f57cdb7568 PaginatorHelper::meta() skips url parameters and disrespects defined routes
PaginatorHelper::meta() skips url parameters (passed and named) which results in urls not respecting defined routes.
It means PaginatorHelper::meta() does not generate same url as PaginatorHelper::prev() & PaginatorHelper::next().
2015-10-07 15:07:37 +03:30
mark_story
506051f688 Correct input generation for postgres numeric types.
Numeric types in postgres are treated like decimals, except they can
have no length, precision or scale components defined.

IE does not accept 1.00000 as a valid step attribute so we'll default to
any when we encounter decimal types with no length.

Refs #7497
2015-10-01 21:46:21 -04:00
Mark Story
12f5aee5a2 Merge pull request #7447 from ravage84/2.7-lib-improvements
Various improvements to the CakePHP lib files
2015-09-25 12:14:00 -04:00
Marc Würth
e690662f0e Various improvments to the CakePH Plib files
Mostly CS, doc blocks and explicit returning nulls.
2015-09-25 17:11:20 +02:00
mark_story
9eafde13d2 Set the key variable in the SessionHelper.
This fixes cross template compatibility between the Flash and Session
helpers.

Refs #7365
2015-09-09 22:08:49 -04:00
mark_story
143c34bdc1 Handle case where a visible input shares a name with an invisible one.
If a visible input is created *after* a hidden input was created, the
form would always blackhole unless the visible input had the same value
as the hidden input.

Refs #7274
2015-08-22 23:10:44 -04:00
mattmemmesheimer
70feb52f73 Changing the default layout to use FlashComponent::render instead of the deprecated SessionComponent::flash. Changing the flash elements to retain the id attribute that was previously present. Also fixing file permissions on the template files I added. 2015-08-20 20:19:22 -05:00
Mark Story
de4b44a37b Merge pull request #7077 from dereuromark/2.7-static
Replacing self with static due to PHP5.3+. Following #7040.
2015-07-23 22:27:37 -04:00
mark_story
b3a192add0 Add warning for irregular method.
Refs #7096
2015-07-23 21:49:22 -04:00
Yoshiyuki Kinjo
00919c5f01 Fix FormHelper::input ignoring value option.
Signed-off-by: mark_story <mark@mark-story.com>

Backport fixes from #7082 to 2.7
2015-07-22 22:00:20 -04:00
Mark Scherer
52e79987a2 Replacing self with static due to PHP5.3+. Following #7040. 2015-07-21 10:22:53 +02:00
mark_story
47378427e3 Merge branch '2.6' into 2.7 2015-07-11 21:25:26 -04:00
Marc Würth
4a131bdcbf Capitalize Windows, the OS 2015-07-09 15:54:03 +02:00
mark_story
cbd45f702d Make FlashComponent/FlashHelper more backwards compatible.
Merge branch 'issue-6874' into 2.7.

Make AuthComponent use FlashComponent, and make FlashHelper more
compatible with SessionHelper::setFlash().
2015-06-26 22:05:32 -04:00
mark_story
ae2ea1ea6c Merge branch '2.6' into 2.7 2015-06-25 21:50:47 -04:00
Highstrike
8257100f54 How about this? 2015-06-24 15:46:48 +03:00
Highstrike
ef1fc7dfef PHPCS 2015-06-24 15:18:57 +03:00
Highstrike
833c747b41 Test append PR to Issue
This commit fixes #6874
2015-06-24 14:18:14 +03:00
Highstrike
7cdf19363d Tab instead of space
IDE preference
2015-06-24 14:09:32 +03:00
Highstrike
58983f717a 2.7.0-RC Auth doesn't use the new Flash component
Changed 'Flash.' to 'Message.' and also provided backwards compatibility
in FlashHelper->render
2015-06-24 14:06:35 +03:00
Mark Scherer
6e5381a4e3 Cleanup method calls. 2015-06-20 23:27:32 +02:00
mark_story
664ba53c89 Merge branch '2.6' into 2.7 2015-06-20 10:03:14 -04:00
Mark Scherer
1d03d5bd59 Consolidate template whitespace 2015-06-20 05:10:35 +02:00
mark_story
705f44e30a Fix regression where attributes were created with no whitespace. 2015-06-19 22:00:27 -04:00
Mark Scherer
7dedf7f86d Refactor cleanly. 2015-06-17 11:38:42 +02:00
Mark Scherer
2d7487d33c img tag needs manual space 2015-06-17 11:34:03 +02:00
Mark Scherer
51d75bc2be Remove overhead whitespace in templates. 2015-06-17 11:04:04 +02:00
Mark Scherer
ccac3b3e06 Allow deep options for radio() just as for select(). 2015-06-16 13:23:51 +02:00
Mark Scherer
4915e802c1 Fix tableCells() 2015-05-02 16:52:51 +02:00
mark_story
345d8d8390 Merge branch '2.6' into 2.7 2015-04-29 19:54:53 -04:00
Mark Scherer
c31fcd6f39 Correct default value to false. 2015-04-21 14:32:34 +02:00
Mark Scherer
8cdf222cc0 Also fix hour() 2015-04-20 22:04:33 +02:00
Mark Scherer
a9ae7fd5bb Fix year form field when magic input wrapper is used.
s
2015-04-20 18:31:00 +02:00
mark_story
3151c53255 Merge branch '2.6' into 2.7 2015-03-23 22:50:09 -04:00
mark_story
744952e344 Fix FormHelper::create() dropping 0 value parameter.
When 0 is the first passed parameter we shouldn't drop it.

Fixes #6107
2015-03-19 21:15:20 -04:00
mark_story
6df7bf9c21 Fix notice errors in pagination link generation.
No errors should be emitted when creating links for models that were not
paginated.

Refs #6090
2015-03-17 22:19:17 -04:00
mark_story
0b916cedbb Merge branch 'master' into 2.7 2015-03-09 21:55:20 -04:00
Mark van Driel
ed5da19d10 Fixed return type of toQuarter in CakeTime and TimeHelper 2015-03-02 12:08:11 +01:00
mark_story
8dba9879d4 Don't generate maxlength properties for decimal columns.
Int casting the decimal scale isn't going to work in a number of
situations as users may end up trying to include decimal points, commas
or spaces in larger amounts.

Fixes #5977
2015-02-27 21:08:54 -05:00
mark_story
63769ae4a6 Merge branch 'master' into 2.7
Conflicts:
	lib/Cake/VERSION.txt
2015-02-26 12:50:35 -05:00
mark_story
ea79cf5d13 Fix words with WWW in them being autolinked.
Don't autolink words that don't have `www.` in them.

Fixes #5968
2015-02-25 20:52:35 -05:00
Mark Story
9f1f158cc0 Merge pull request #5855 from tanuck/2.7-custom-flash-message
Backport of 3.x flash messages #5823
2015-02-14 22:07:30 -05:00
mark_story
b3c9c1615e Fix doubly linking URLs starting with //
Fixes #5889
2015-02-13 21:40:50 -05:00