Commit graph

18694 commits

Author SHA1 Message Date
Mark Story
b57009cbb9 Merge pull request #9067 from cakephp/2.x-stickler
Make stickler ignore 2.x and 2.next branches.
2016-07-01 17:19:26 -04:00
José Lorenzo Rodríguez
b5387b2f07 Merge pull request #9065 from alex2690/issue9064
fixes #9064 - added new locale for Icelandic language
2016-07-01 22:34:02 +02:00
ADmad
e6a3bdf954 Make stickler ignore 2.x and 2.next branches. 2016-07-01 17:28:50 +05:30
Alex Para
58a31ecfe5 fixes #9064 2016-07-01 14:46:27 +03:00
Alex Para
3a42ecc61c fixes #9064 - added new locale for Icelandic language 2016-07-01 11:11:16 +03:00
Jorge González
f699afe7e0 add missing Flash default element 2016-06-30 20:05:36 +01:00
mark_story
7626896286 Merge branch '2.x' of github.com:cakephp/cakephp into 2.x 2016-06-28 22:07:44 -04:00
mark_story
a366ac1f66 Merge branch 'issue8654' into 2.x
Removes empty string elements from the secured field list, as in 3.x
2016-06-28 22:07:07 -04:00
mark_story
7c2d6ae197 Combine code paths.
At the end of both if/else arms we should have an array that can be
pushed through Hash::filter().

Refs #8654
2016-06-28 22:06:53 -04:00
nojimage
57e0a97483 refs #8654 FormHelper cleanup unlockFields key 2016-06-28 22:01:06 -04:00
Mark Story
0e97116093 Merge pull request #9042 from gestudio/patch-1
Issue #9040 - Auth saving json in Auth.redirect
2016-06-27 21:48:56 -04:00
mark_story
7e27fccca8 Restore version file to 2.9.0-dev 2016-06-27 21:48:08 -04:00
mark_story
432eb9c432 Merge branch '2.x' into 2.next 2016-06-27 21:47:47 -04:00
mark_story
f28c21c7a7 Stop testing against SSL ciphers that emit warnings.
Testing that SSLv3 still works is causing test failures.
2016-06-27 21:47:37 -04:00
Iñigo In The Cloud
2c112095a9 Issue #9040 - Auth saving json in Auth.redirect
AuthComponent is storing JSON or any other AJAX request URL into the session variable Auth.redirect used for login redirect if the AJAX request does not send the X-Requested-With:XMLHttpRequest header.

If you send an ajax request without that header and your request is not a (.json) it will store the URL anyway.
2016-06-27 14:15:05 -04:00
mark_story
92a50d05dc Reset query timing metrics for begin/commit/insert multi calls.
Apply patch from @Mensler to reset the query metrics for transaction
operations, and for each iteration of an insertMulti call. This helps
provide more accurate query times.

Refs #9014
2016-06-22 22:20:00 -04:00
Mark Story
7735a6182f Merge pull request #8994 from chinpei215/2.8-home-errormsg
Fix misnamed variable in default home.ctp
2016-06-16 00:11:45 -04:00
chinpei215
0bf38c1ee4 Fix misnamed variable in default home.ctp
PDO error message wouldn't appear when using PHP 5.4 or later.
2016-06-16 12:12:37 +09:00
Mark Story
9cc515bf9e Merge pull request #8982 from kolorafa/patch-1
Can't override CakeEmail class and use deliver
2016-06-13 21:17:22 -04:00
kolorafa
449e5fc9cf Can't override CakeEmail class and use deliver
When using TemplateEmail::deliver it always create new instance of CakeEmail, I assume it should create my extended "TemplateEmail" class insted.

PHP >5.3 compatible
2016-06-13 18:02:26 +02:00
mark_story
d352b5f14d Correct domain name used to upload pear packages. 2016-06-12 22:17:04 -04:00
mark_story
64e7c8d991 Update version number to 2.8.5 2016-06-12 22:15:08 -04:00
José Lorenzo Rodríguez
571b33e1f2 Merge pull request #8930 from cakephp/issue-8929
Add missing uses() call.
2016-06-03 08:16:27 +02:00
mark_story
7055e82eab Add missing uses() call.
Refs #8929
2016-06-02 22:04:50 -04:00
mark_story
c2bc45ac42 Remove old logo from README. 2016-05-29 16:29:05 +02:00
Mark Story
55e9638044 Merge pull request #8844 from icyrizard/add_http_patch_content_type_check
Add HTTP patch Content-Type check
2016-05-27 15:41:18 +02:00
Aloïs Thévenot
b737e9f732 #8844 Add test 2016-05-27 12:50:23 +00:00
mark_story
8c73086717 Fix PHPCS error. 2016-05-25 23:05:12 +02:00
mark_story
e78af35af7 Only clear the unlocked fields on end().
Doing this work on end() allows fields to be unlocked before the form is
created which can be helpful.

Refs #8880
2016-05-25 23:04:53 +02:00
Mark Story
b15560ea0c Merge pull request #8880 from nojimage/form-unlockfields-2x
Reset FormHelper::$_unlockFields for 2.x
2016-05-25 22:59:25 +02:00
mark_story
d5d46e21bd Fix indentation. 2016-05-22 16:39:49 -04:00
Mark Story
1a7e8c51e7 Merge pull request #8848 from xhs345/2.x
Add attribute 'fieldset' to Form->radio
2016-05-22 16:38:39 -04:00
nojimage
850305a384 fixes reset FormHelper::$_unlockFields 2016-05-21 13:33:20 +09:00
xhs345
df4c87bacd Merge remote-tracking branch 'origin/2.x' into 2.x 2016-05-19 17:34:13 -07:00
xhs345
eeefa03546 Updated Radio and Inputs form helper
Also added UnitTest for radio fieldset class-name
2016-05-19 17:28:47 -07:00
xhs345
dcd7563707 Rewrote class attribute assignment 2016-05-18 23:04:23 -07:00
mark_story
0d32554546 Move codesniffer into suggests.
Not everyone will want/need the codesniffer.
2016-05-18 22:07:33 -04:00
Mark Story
0fd3ad9b76 Merge pull request #8851 from MarkusBauer/v2.x/SqliteTestEnhancements
Sqlite testcase enhancements
2016-05-18 22:01:33 -04:00
Mark Story
11661be50f Merge pull request #8852 from MarkusBauer/v2.x/SqliteFixCurrentTimestampDefault
Fixing 'default current_timestamp' in Sqlite
2016-05-18 21:59:43 -04:00
Mark Story
8f6c18f9d8 Merge pull request #8838 from cakephp/issue-8765
Improve out of the box composer experience for 2.x
2016-05-18 21:47:25 -04:00
Markus Bauer
2227e01990 Fixing Sqlite's handling of datetime/timestamp columns with current_timestamp default set 2016-05-19 00:21:43 +02:00
Markus Bauer
058809275c Enable nested transactions before trying to test them 2016-05-18 23:46:51 +02:00
Markus Bauer
f75ebf8cb9 Make Sqlite Testcases compatible with Windows / NTFS file systems 2016-05-18 23:46:10 +02:00
xhs345
615be3ad14 Fix for Issue #8847
Add attribute 'fieldset' to Form->radio
2016-05-18 10:53:06 -07:00
Richard Torenvliet
e31ce0d58f Add the HTTP Patch to the Content-Type check mechanism
Currently when a request is of type 'patch' it is ignored. This commit makes
sure that the Content-Type is checked when a patch request is provided.
2016-05-18 14:54:52 +02:00
mark_story
c7a48acd10 Add composer.json for the app/
This will act as a stub for developers to extend and improve upon when
they build their apps. Hopefully people don't find the two composer.json
files overly confusing.

Refs #8765
2016-05-17 22:29:59 -04:00
mark_story
c02b269bcb Fix default installation path for vendors.
By default global vendors go into `/vendors`. This config change helps
people get started with less friction. I've removed debugkit as
a dependency, as it isn't _really_ a dependency for CakePHP itself.

Refs #8765
2016-05-17 22:24:00 -04:00
Mark Story
326583153a Merge pull request #8816 from steampilot/2.x-folder-time-sort
Added sorting by modified time in Folder util
2016-05-12 19:26:38 -04:00
Steampilot
723ed96fd6 Added sorting by modified time in Folder util 2016-05-12 16:28:04 +02:00
ADmad
66077f9312 Merge pull request #8789 from cakephp/fix-php7-issue
Port PHP7 fixes to 2.x
2016-05-09 01:39:17 +05:30