Sebastien Barre
2995d9319c
Prepend model alias for safety
2014-11-01 09:36:59 -04:00
Sebastien Barre
417c137d11
Fix DigestAuthenticate test
2014-10-31 21:42:18 -04:00
Sebastien Barre
544ddac08c
Fix indentation
2014-10-31 16:38:09 -04:00
Sebastien Barre
60917974bf
Add test for userFields and related models
2014-10-31 16:35:55 -04:00
Sebastien Barre
f6c71024c5
Add test for the 'contain' setting, which was missing (unrelated to feature)
2014-10-31 16:04:09 -04:00
Sebastien Barre
2f62ee2cde
ticket #5017 add userFields setting to BaseAuthenticate
2014-10-31 15:00:19 -04:00
mark_story
579b16d90b
Merge branch 'master' into 2.6
2014-10-30 21:20:53 -04:00
euromark
0f9890720e
Correct test
2014-10-31 01:45:41 +01:00
euromark
bb67df4305
Simplify test
2014-10-31 01:18:08 +01:00
Mark Story
a8c5b70b22
Merge pull request #4489 from busgurlu/patch-1
...
to correctly return SET() type
2014-10-30 19:56:47 -04:00
euromark
70acd2fe3f
doc block update.
2014-10-30 19:15:23 +01:00
euromark
e5b45bcdea
Fix IN replacement in virtual fields for MYSQL.
2014-10-30 19:14:04 +01:00
mark_story
1e8f12f9f5
Bump the depth of variables in stack traces to 4.
...
Giving more context allows developer to look at request/response data
more easily.
Fixes #5005
2014-10-29 21:43:18 -04:00
Mark Story
94d56a3d74
Merge pull request #4985 from fixon/issue-2172
...
Make CakeResponse::file() accept ranges even when download option is fal...
2014-10-29 07:52:09 -04:00
José Lorenzo Rodríguez
a0aac5cfa9
Merge pull request #5001 from cakephp/issue-4990
...
Relative paths should be created relative to pwd.
2014-10-28 14:20:30 +01:00
José Lorenzo Rodríguez
9d0390ca63
Merge pull request #4953 from jrbasso/2.6-route-set-state
...
Implementing __set_state for CakeRoute
2014-10-28 09:36:42 +01:00
Juan Basso
6171ef69c3
Update test cases for CakeRoute::__set_state
...
It removes the eval and test the __set_state more explicitly.
2014-10-27 23:45:46 -04:00
mark_story
d228d83b1e
Relative paths should be created relative to pwd.
...
If create() is called with a relative directory and the path does not
exist, it should be created inside of the folder->pwd() and not inside
the process' cwd.
Refs #4990
2014-10-27 21:32:28 -04:00
mark_story
ebc1bcb624
Add additional useful tests for autoLink()
...
These new tests cover an important case that could easily be missed in
the future. Links with URL's should not be re-linked.
Refs #4998
2014-10-27 21:03:03 -04:00
mark_story
177b797aab
Merge branch 'master' into 2.6
2014-10-26 21:25:05 -04:00
José Lorenzo Rodríguez
431578d956
Merge pull request #4931 from jrbasso/2.6-router-optimization
...
Simplified way to add new prefixes to the router
2014-10-26 22:09:17 +01:00
Marek Władysz
65cb186652
Use assertNotSame() instead of assertTrue($result !== false)
2014-10-26 14:19:19 +01:00
Mark Story
5b32fd7e25
Merge pull request #4975 from ptica/disabled-hidden-input
...
Disable the hidden input for multi checkbox inputs when inputs are disabled.
2014-10-25 20:12:35 -04:00
Jan Ptacek
797635d26b
fixing testcases + do not disable the hidden input on partial disables
2014-10-25 21:05:37 +02:00
Marek Władysz
090e85a5a4
Make CakeResponse::file() accept ranges even when download option is false.
2014-10-25 19:49:56 +02:00
mark_story
4b5783c5fe
Add deterministic ordering to translate associations.
...
Having a deterministic ordering based on the primary key resolves
tests potentially failing when postgres returns data in a non-sequential
order.
2014-10-24 22:21:06 -04:00
mark_story
b5050db643
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6
2014-10-24 22:06:03 -04:00
mark_story
b98d2a3365
Merge branch 'master' into 2.6
2014-10-24 22:05:46 -04:00
ptica
abb0c7cb9d
Update FormHelper.php
...
disabled multiple checkbox input should not generate an enabled hidden input,
as it leads to saving empty data upon submission -> carrying the disabled attribute to the hidden input prevents this
2014-10-24 18:25:31 +02:00
Juan Basso
f7320cd8cd
Fixed PHPCS issues
2014-10-21 23:47:17 -04:00
Juan Basso
b2a92f9cd8
Implementing __set_state for CakeRoute
...
It helps the applications to cache the routes using var_export when possible.
2014-10-21 23:04:08 -04:00
Mark Story
1a799b07b3
Merge pull request #4944 from agarzon/patch-1
...
Update .gitattributes
2014-10-21 20:05:26 -04:00
José Lorenzo Rodríguez
47bff090b8
Merge pull request #4950 from bcrowe/fix-viewtask
...
Fix views overwrite warning text
2014-10-21 21:12:27 +02:00
Bryan Crowe
6f4c3b2765
Fix views overwrite warning text
2014-10-21 14:39:09 -04:00
José Lorenzo Rodríguez
82ee5b0d1c
Merge pull request #4947 from agarzon/patch-2
...
Removing unrelated parameter in comment
2014-10-21 20:24:57 +02:00
Alexander Garzon
09ebb8bace
Removing unrelated parameter in comment
...
That parameter doesn't exists in display() function (in fact is not a parameter) and is breaking the [CakePHP code standards]:https://github.com/cakephp/cakephp-codesniffer
2014-10-21 14:11:51 -04:00
Alexander Garzon
3a3ddf414c
Update .gitattributes
...
PDF is a common file that should not be modified.
2014-10-21 10:33:46 -04:00
Mark Story
7930e680cb
Merge pull request #4940 from jrbasso/2.6-router-optimization-2
...
Replaced for loops by foreach
2014-10-20 17:27:55 -04:00
Juan Basso
833ca68a55
Replaced for loops by foreach
2014-10-20 16:43:11 -04:00
Juan Basso
9b4379b17d
Simplified way to add new prefixes to the router
2014-10-19 21:55:33 -04:00
Mark Story
6b723b9327
Merge pull request #4930 from jrbasso/2.6-not-executed
...
Removed the code that was never being executed
2014-10-19 20:40:58 -04:00
Juan Basso
ba0901d40e
Removed the code that was never being executed
2014-10-19 18:56:02 -04:00
ADmad
62f392a011
Merge pull request #4921 from dmromanov/patch-1
...
Documentation correction
2014-10-19 01:37:18 +05:30
dmromanov
959a22a8b2
Documentation correction
2014-10-19 00:05:08 +04:00
mark_story
cdc67116c5
Handle query string arguments in digest auth data.
...
Handle &, ? in digest auth data uri.
Refs #4908
2014-10-17 23:12:41 -04:00
Mark Story
5263edde8b
Merge pull request #4897 from ravage84/2.6-mysql-table-comments
...
2.6 Add Support for MySQL Table Comments
2014-10-16 18:42:07 -04:00
Marc Würth
2ad181b6e1
Now the tableParameters array gets escaped through values(), too
2014-10-16 19:10:52 +02:00
Marc Würth
b3770974f1
Added tests for MySQL table comment feature
2014-10-16 16:44:09 +02:00
Marc Würth
84b0fe1c88
Added comment to $tableParameters array
2014-10-16 16:06:33 +02:00
mark_story
4c93f103c7
Merge branch 'master' into 2.6
2014-10-15 23:28:27 -04:00
