Mark Story
25b62b6c5d
Merge pull request #9664 from xhs345/2.x-stacking-flash-messages
...
2.next Support Stacking Flash Messages
2016-11-01 21:24:24 -04:00
xhs345
e1c5ef9e7a
Add clear option to Flash Message
...
To give user the option to disable Stacking of messages and being consistent with 3.x
2016-10-30 20:39:00 -07:00
xhs345
924d382bb3
Fix tests
2016-10-28 09:10:01 -07:00
xhs345
c59fb85da8
Add support for stacking Flash messages
...
See Issue #7830
2016-10-28 09:10:01 -07:00
mark_story
135a24e0f1
Merge branch '2.x' into 2.next
2016-10-28 00:29:46 -04:00
Mark Story
1a58d15632
Merge pull request #9635 from cakephp/issue-9632
...
Allow '' to be a valid key for Hash, and Session
2016-10-26 21:16:20 -04:00
Mark Story
d7f82608c9
Merge pull request #9643 from xhs345/patch-1
...
In composer.json: Update CakePHP version to 2.9
2016-10-23 10:08:29 -04:00
Alex
6bae308778
Update CakePHP version to 2.9
2016-10-22 20:22:21 -07:00
mark_story
c935bed8f6
Fix PHPCS
2016-10-21 18:35:05 -04:00
mark_story
816801902e
Allow '' to be a valid key for Hash, and Session
...
By removing a bunch of empty() guards we can make '' behave like all the
other key names. This does change the existing behavior/tests around ''
key, but I think that is ok given the need to manipulate ''.
Refs #9632
2016-10-21 10:54:39 -04:00
Mark Story
cf7473aacc
Merge pull request #9616 from chinpei215/2.10-debug-security
...
[2.10] Backporting security debug to 2.x
2016-10-17 08:28:26 -04:00
chinpei215
3102d89313
Fix a test for PHP5.3
2016-10-16 22:40:27 +09:00
chinpei215
739664d6c7
Add more tests
2016-10-16 22:28:28 +09:00
chinpei215
d7ae1c92e7
Backport test cases and make sure those pass
2016-10-16 22:04:24 +09:00
chinpei215
0d96b9ff64
Backport changes in SecurityComponent and FormHelper
2016-10-16 21:55:05 +09:00
chinpei215
3ccc35b32c
Start working on backporting security debug to 2.x
...
- Add SecurityException
- Add AuthSecurityException
Refs #8449
2016-10-16 11:47:26 +09:00
Mark Sch
40c32e8bdf
Merge pull request #9605 from TekkCraft/2.x-mapresource
...
Add connectOptions to doc block
2016-10-12 15:28:36 +02:00
TekkCraft
1c37640678
Add connectOptions to doc block
2016-10-12 15:25:31 +02:00
Mark Story
a3577978b0
Merge pull request #9603 from cakephp/issue-9592
...
Fix warning in PHP 7.1
2016-10-11 17:23:00 -04:00
mark_story
8baf193995
Fix warning in PHP 7.1
...
Refs #9592
2016-10-11 16:59:35 -04:00
mark_story
6cdf38c2ef
Update version number to 2.9.1
2016-10-10 21:36:32 -04:00
mark_story
ecd270d04b
Tweak/Add doc blocks.
2016-10-09 11:05:35 -04:00
Mark Story
e8683fdde5
Merge pull request #9587 from dmaicher/model-query-cache
...
[Bugfix] use Model::$cacheQueries as default for ->query(...) (#9575 )
2016-10-09 11:00:49 -04:00
David Maicher
a932bce3de
[Bugfix] use Model::$cacheQueries as default for ->query(...)
2016-10-09 13:43:27 +02:00
Mark Story
b790398efb
Merge pull request #9567 from AshleyPinner/2.next
...
(2.next) Adding Base64 support to the HtmlHelper::image() function
2016-10-07 20:40:23 -04:00
Mark Story
c4d98cf029
Merge pull request #9581 from cakephp/dereuromark-patch-1
...
Fix broken template
2016-10-07 09:46:17 -04:00
Mark Sch
a35eec3f1b
Fix broken template
2016-10-07 12:25:24 +02:00
Mark Story
e784f67e26
Merge pull request #9577 from cakephp/2.x-cleanup
...
Remove dead code
2016-10-06 22:03:13 -04:00
Mark Sch
bf908762db
Remove dead code
2016-10-07 01:35:26 +02:00
Ashley Pinner
5f22fae1da
Adding Base64 support to the HtmlHelper::image() function
...
Requested by cakephp/cakephp#9560
2016-10-06 09:01:15 +01:00
José Lorenzo Rodríguez
9425234b87
Merge pull request #9550 from cakephp/issue-9526
...
Fix enum column length detection.
2016-10-06 09:29:25 +02:00
mark_story
9c3b17cbc7
Fix failing test in postgres.
2016-10-05 22:28:51 -04:00
mark_story
689d516a99
Fix typo.
2016-10-04 21:38:26 -04:00
mark_story
3a185f9713
Remove incorrrect postgres implementation.
...
It was wrong, and no longer really needs to exist as the parent method
covers all the scenarios that were previously required other than the
uuid one.
2016-10-02 22:59:13 -04:00
mark_story
3587ac9976
Fix PHPCS error.
2016-10-02 19:06:10 -04:00
Mark Story
3e222c1d69
Merge pull request #9552 from garethellis36/check-return-type-of-dir-function-in-fileengine
...
2.x - adds a check that dir() has returned an instance of Directory to FileEngine::_clearDirectory()
2016-10-02 18:56:56 -04:00
Mark Story
3afbd25b72
Merge pull request #9555 from CakeDC/issue/cake-schema-validate-table-name
...
Validate table name when generating schema file
2016-10-02 18:55:15 -04:00
Andrej Griniuk
2d6e85ed14
validate table name before generating schema file
2016-10-03 00:23:05 +08:00
Gareth Ellis
5eb9dde78a
Adds a check that dir() has returned an instance of Directory to FileEngine::_clearDirectory()
2016-10-02 10:59:27 +01:00
mark_story
e41ccdb701
Fix enum column length detection.
...
Use simpler code to calculate the length of fields. Include more tests
for DboSource as there weren't any before.
Refs #9526
2016-09-30 22:25:25 -04:00
Mark Story
5e0dc218f1
Merge pull request #9488 from tersmitten/lastaction-should-also-work-with-named-parameters-in-the-url-2x
...
_lastAction() should also work with named parameters in the url
2016-09-24 21:04:14 -04:00
José Lorenzo Rodríguez
5a9c6b3266
Merge pull request #9510 from cakephp/autoload-object
...
Ensure Object is autoloaded.
2016-09-23 23:16:20 +02:00
mark_story
57bc0f9c45
Ensure Object is autoloaded.
...
When Object was renamed to CakeObject we broke behavior where plugins
and app code were relying on Object being configured in the autoloader
automatically.
Refs cakephp/debug_kit#450
2016-09-23 14:22:10 -04:00
Mischa ter Smitten
1ccdc21d5b
Possible fix for _lastAction method
2016-09-22 21:33:43 +02:00
Mischa ter Smitten
197c2f4e60
Make use of assertAttributeEquals
2016-09-22 21:30:18 +02:00
Mischa ter Smitten
4c9f1cc154
_lastAction() should also work with named parameters in the url
2016-09-20 15:07:36 +02:00
Mark Story
1c29577145
Merge pull request #9482 from rozehnal/2.next
...
Avoiding extract call in CakeSchema class
2016-09-19 15:56:50 -04:00
Rozehnal, Pavel
34fa24f225
Avoiding extract in CakeSchema class
...
due bad readability and avoiding parsing error in IDEs - no functional changes
2016-09-19 14:10:02 +02:00
mark_story
35d04ecb3d
Update version number to 2.9.0
2016-09-18 22:24:27 -04:00
mark_story
68abc090ac
Rollback version file change.
...
Build tools will fail otherwise.
2016-09-18 22:24:05 -04:00