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
José Lorenzo Rodríguez
f616667a6f
Merge pull request #4891 from cakephp/fix-memcached-failures
...
Fix Memcached test failures.
2014-10-15 21:42:33 +02:00
mark_story
afcd0312bf
Fix Memcached test failures.
...
The Memcached extension does not provide enough information to PHP's
Reflection API to allow mock objects to be generated correctly. We'll
skip the affected tests until php-memcached-dev/php-memcached#126 has
been resolved.
2014-10-15 11:11:50 -04:00
José Lorenzo Rodríguez
923e1c5300
Merge pull request #4884 from cakephp/issue-4876
...
Add default prefix to RedisEngine
2014-10-15 15:26:01 +02:00
mark_story
b86aae4d8b
Add default prefix to RedisEngine
...
This makes redis work like the other cache engines. Also by having
a default prefix the clear() method will not wipe all the data in the
current redis database.
Refs #4876
2014-10-14 22:47:34 -04:00
José Lorenzo Rodríguez
e686a43524
Merge pull request #4867 from cakephp/issue-4694
...
Fix getMockForModel() using the incorrect datasource.
2014-10-14 14:13:01 +02:00
mark_story
1c440e2cb2
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6
2014-10-13 21:11:52 -04:00
mark_story
87fcc9f0b9
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-10-13 21:11:38 -04:00
mark_story
b55a88508f
Fix PHPCS and PHP5.3 error.
2014-10-13 21:07:08 -04:00
mark_story
50b3893e65
Make rule sniff less complicated and tidy up doc block.
...
Refs #4871
2014-10-13 17:59:31 -04:00
Mark Story
1ded0c21dd
Merge pull request #4871 from rchavik/2.5-is-unique-test
...
2.5 Add isUnique test + possible fix
2014-10-13 17:55:15 -04:00
Rachman Chavik
dcb605c700
Possible fix for isUnique backward compatibility
2014-10-13 19:46:10 +07:00
Rachman Chavik
dc7b8cbb89
Add BC test for #4851
2014-10-13 19:40:30 +07:00
mark_story
9b9e886df6
Fix getMockForModel() using the incorrect datasource.
...
Because getMockForModel() does not go through the test datasource
injection in ClassRegistry::init() we need to duplicate the basics of
that logic here. Thankfully, we already have a mock so we can do that
datasource switching without reflection. Of course this means there will
be limitations to how/when this will work, but I feel those scenarios
can probably be solved by not using mocks, or by mocking out the
problematic methods. This set of changes makes getMockForModel() work
with secondary datasources, as one would expect it to do, but I'm not
sure it ever did.
Refs #4694
2014-10-12 22:30:22 -04:00
ADmad
6dc98afa1e
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-10-12 20:20:14 +05:30
ADmad
ecf030796b
Fix docblock
2014-10-11 19:37:22 +05:30
Mark Story
63ffb2215b
Merge pull request #4853 from ceeram/2.6-atomic-translate
...
TranslateBehavior now uses original atomic option value, if set
2014-10-10 17:48:31 -04:00
Mark Story
6ee203541f
Merge pull request #4851 from cakephp/issue-4571
...
Fix Model::isUnique() not working as a validator.
2014-10-10 12:18:09 -04:00
Bryan Crowe
e48831a4a7
Merge pull request #4855 from ceeram/2.6-phpcs
...
Fix PHPCS errors
2014-10-10 11:25:03 -04:00