mark_story
|
430ef88118
|
Merge branch 'master' into 2.5
Conflicts:
lib/Cake/VERSION.txt
|
2013-11-25 23:15:15 -05:00 |
|
mark_story
|
eb34e011e2
|
Update version number to 2.4.3
|
2013-11-24 21:25:25 -05:00 |
|
José Lorenzo Rodríguez
|
edc6fc6701
|
Merge pull request #2379 from rspenc29/2.5
Added support for passing additional flags to mysql connection
|
2013-11-24 01:07:58 -08:00 |
|
Rob Spencer
|
b8e32dd2b3
|
Adding flags override to additional pdo drivers
|
2013-11-24 01:04:17 -05:00 |
|
Rob Spencer
|
cda9320e96
|
Added support for passing additional flags to mysql connection
|
2013-11-24 00:47:06 -05:00 |
|
mark_story
|
eac6d7850f
|
Remove pointless array cast.
|
2013-11-23 12:36:15 -05:00 |
|
mark_story
|
5e77183afe
|
Fix failing tests when Console group was run in isolation.
|
2013-11-23 12:36:02 -05:00 |
|
mark_story
|
311189a662
|
Sort tables before returning them.
This fixes unsorted table lists in the various bake related tasks.
Fixes #2386
|
2013-11-23 12:34:16 -05:00 |
|
mark_story
|
d97cf79545
|
Add coverage for comma in email alias.
Closes #2381
|
2013-11-22 13:14:21 -05:00 |
|
mark_story
|
37e387fed2
|
Replace non-breaking spaces with Inflector::slug().
Fixes #2363
|
2013-11-22 10:13:10 -05:00 |
|
imsamurai
|
62a53d26bb
|
fix typo
|
2013-11-22 16:17:25 +02:00 |
|
mark_story
|
a4460ff228
|
Fix tests even better than before.
The current tests work on travis, but fail on jenkins. Fix that up.
|
2013-11-21 22:57:50 -05:00 |
|
mark_story
|
71312932e8
|
Merge branch 'master' into 2.5
|
2013-11-21 21:46:21 -05:00 |
|
mark_story
|
0e7b0ad111
|
Fix failing test.
|
2013-11-21 21:46:03 -05:00 |
|
Mark Story
|
f3ca966623
|
Merge pull request #2377 from bar/patch-1
Always remove verify_host from SSL context.
|
2013-11-21 11:03:37 -08:00 |
|
ber clausen
|
1b9bf7b0fd
|
Always remove verify_host from SSL context.
It is only used to be able to set ```CN_match```.
|
2013-11-21 16:23:01 -02:00 |
|
José Lorenzo Rodríguez
|
df5fc2304a
|
Merge pull request #2289 from bar/2.5-optimize-dbosource
First part of the DboSource cleanup.
|
2013-11-21 01:02:36 -08:00 |
|
Mark Story
|
399e7b10ac
|
Merge pull request #2362 from davidsteinsland/2.5
Added msgpack support for Memcached
|
2013-11-20 19:44:07 -08:00 |
|
Eric Büttner
|
8c319c7dbc
|
fix the failing test case.
|
2013-11-20 12:26:03 +01:00 |
|
Mark Story
|
7fdf17e43e
|
Merge pull request #2367 from cakephp/issue-2364
Leave db->cacheSources unaltered.
Fixes #2364
|
2013-11-19 15:37:16 -08:00 |
|
mark_story
|
1be40d5d64
|
Fix coding standards error.
Refs #2364
|
2013-11-19 18:36:52 -05:00 |
|
mark_story
|
ec38ee1c48
|
Only enable cacheSources if both the datasource + model agree on it.
This prevents models from flipping cacheSources on when the datasource
has it disabled already.
Refs #2364
|
2013-11-19 17:36:20 -05:00 |
|
mark_story
|
99fd6e40fe
|
Leave db->cacheSources unaltered.
When a model uses cacheSources = false, it should not have side effects
on the datasource.
Fixes #2364
|
2013-11-19 15:06:55 -05:00 |
|
davidsteinsland
|
c29d2abf69
|
Fixed test
|
2013-11-19 12:10:01 +01:00 |
|
davidsteinsland
|
22d9cd8a00
|
Fixed test case
|
2013-11-19 11:58:52 +01:00 |
|
davidsteinsland
|
881f81d01a
|
Fixed undefined constant
|
2013-11-19 11:50:28 +01:00 |
|
davidsteinsland
|
7056ccd38a
|
Added msgpack support for Memcached
|
2013-11-19 11:35:05 +01:00 |
|
imsamurai
|
f817beb8b6
|
change method public unsigned to protected _unsigned
|
2013-11-19 10:55:44 +02:00 |
|
imsamurai
|
1313b81913
|
fix since phpdoc tag for fixture
|
2013-11-19 10:48:51 +02:00 |
|
mark_story
|
3b8208be2e
|
Merge branch 'master' into 2.5
|
2013-11-18 21:49:13 -05:00 |
|
Mark Story
|
cc94026f7e
|
Merge pull request #2358 from mathop/2.4-html-meta-icon
Fix duplicated webroot path on HtmlHelper::meta('icon').
|
2013-11-18 18:07:36 -08:00 |
|
Matheus Pedroso
|
4677ddf490
|
Fix duplicated webroot path on HtmlHelper::meta('icon').
|
2013-11-18 23:38:01 -02:00 |
|
ADmad
|
dda6080579
|
Merge branch 'master' into 2.5
|
2013-11-19 00:27:12 +05:30 |
|
Eric Büttner
|
1e3865acc7
|
formatting app::uses blocks (refs #2265)
|
2013-11-18 11:56:00 +01:00 |
|
imsamurai
|
20dc92291e
|
fix broken test
|
2013-11-17 23:34:22 +02:00 |
|
imsamurai
|
0286e4120d
|
fix code style
|
2013-11-17 23:12:51 +02:00 |
|
imsamurai
|
8bcfe452da
|
not add unsigned to not numeric fields, fix broken test, add new test
|
2013-11-17 23:10:53 +02:00 |
|
imsamurai
|
2f6122cb01
|
add unsigned property in Model::describe
|
2013-11-17 22:37:01 +02:00 |
|
imsamurai
|
00fb663f90
|
remove numeric from unsigned config
|
2013-11-17 21:23:13 +02:00 |
|
imsamurai
|
1d9ecc6c94
|
Merge upstream/2.5 into 2.5
|
2013-11-17 21:13:25 +02:00 |
|
Mark Story
|
df52e85e0c
|
Merge pull request #2338 from ravage84/hash-linked
Added link to three hash methods
|
2013-11-16 18:53:45 -08:00 |
|
Marc Würth
|
229bd69903
|
Added link to three hash methods
|
2013-11-17 03:40:39 +01:00 |
|
mark_story
|
016c3aed44
|
Add test for saveAssociated and expression objects.
Add a test for #1514. This issue was fixed during recent refactorings.
Closes #1514
|
2013-11-16 10:51:14 -05:00 |
|
mark_story
|
cee2801700
|
Add 'metadata' to the uninflected list.
Fixes #2332
|
2013-11-15 21:49:05 -05:00 |
|
mark_story
|
b6b8d83980
|
Remove non-portable data type from MySQL.
'numeric' is a non-portable type that is not supported by any other
database driver. Removing it now will prevent future problems.
|
2013-11-14 10:28:09 -05:00 |
|
Mark Story
|
17ae40f0ce
|
Merge pull request #2319 from ravage84/php-5-removal
Removed "PHP 5" from file header DocBlocks
|
2013-11-14 06:41:31 -08:00 |
|
imsamurai
|
f1a2c1a75c
|
add decimal type for unsigned
|
2013-11-14 10:56:51 +02:00 |
|
imsamurai
|
15805e668e
|
fix phpcs errors
|
2013-11-14 02:39:16 +02:00 |
|
imsamurai
|
7bc8dac453
|
fix phpcs errors
|
2013-11-14 02:19:41 +02:00 |
|
imsamurai
|
87fef89737
|
fix phpcs errors
|
2013-11-14 02:19:31 +02:00 |
|