11 commits

Author	SHA1	Message	Date
mark_story	2032fef772	Merge branch '2.x' into 2.next	2017-06-26 21:51:41 -04:00
Marc Würth	da8414e13b	Use HTTPS for the opensource.org MIT license URL	2017-06-11 00:23:22 +02:00
Marc Würth	04efc7ba50	Use HTTPS for the book.cakephp.org URL	2017-06-11 00:15:36 +02:00
Marc Würth	10b89b51a9	Use HTTPS for the cakefoundation.org URL	2017-06-11 00:10:59 +02:00
chinpei215	31a1837c1d	Merge branch '2.x' into 2.next ... Conflicts: lib/Cake/Test/Case/View/Helper/FlashHelperTest.php lib/Cake/VERSION.txt lib/Cake/View/Helper/FlashHelper.php	2017-03-25 17:12:28 +09:00
chinpei215	94d9bcd674	Fix FlashHelper::render() cannot render default messages ... Fixes #9910	2017-01-05 19:00:52 +09:00
xhs345	924d382bb3	Fix tests	2016-10-28 09:10:01 -07:00
mark_story	97c5463387	Fix failing tests. ... FlashHelper uses `Message` not flash now. This is more backwards compatible with 2.x Refs #6874	2015-06-26 22:04:00 -04: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
James Tancock	e173c29d33	Fix for phpcs	2015-02-04 15:31:50 +00:00
James Tancock	b8b6b67abd	Tests for ported Flash component & helper	2015-02-04 15:05:40 +00:00