mark_story
bf2f2e772e
Split existing tests up, and add tests for Router based image URL's
...
Refs #2233
2013-11-09 12:00:56 -05:00
mark_story
3c1f775ab2
Merge branch 'master' into 2.5
2013-11-09 09:37:27 -05:00
mark_story
ada0ec4c77
Fix formatting of decimal values when there is no fractionSymbol.
...
When a currency format does not include a fractionSymbol it should be
able to format fractional values.
Fixes #2253
2013-11-09 09:36:38 -05:00
mark_story
407c420176
Remove CRLF from To headers in MailTransport.
...
Like other header fields To should not contain CRLF.
Refs #2209
2013-11-08 13:25:51 -05:00
mark_story
2e7d687b98
Merge branch 'master' into 2.5
2013-11-07 23:01:25 -05:00
Mark Story
d7977c6812
Merge pull request #2282 from bcrowe/hotfix-returnType
...
Add missing return type
2013-11-07 20:01:07 -08:00
Bryan Crowe
9ee5efaa2d
Add missing return type
2013-11-07 22:14:11 -05:00
mark_story
145dbacb78
Fix incorrectly encoded headers in MailTransport.
...
When encoded values are present in header fields, they need to have
newlines removed as leaving the newlines in place and interfere with
delivery on Qmail based SMTP servers.
Fixes #2209
2013-11-04 22:17:21 -05:00
José Lorenzo Rodríguez
ebd2132d72
Merge pull request #2274 from ADmad/feature/postlink-buffer
...
Added buffering of form tags generated by FormHelper::postLink()
2013-11-04 01:29:56 -08:00
ADmad
d647fe8a91
Added buffering of form tags generated by FormHelper::postLink()
2013-11-03 23:11:11 +05:30
mark_story
afd182898f
Merge branch 'master' into 2.5
2013-11-01 16:54:57 -04:00
ADmad
f3284d9e5b
Merge pull request #2263 from davidsteinsland/2.5
...
Added configurable default value to Hash::get()
2013-11-01 07:10:22 -07:00
mark_story
d8acf531cb
Merge branch 'postgres-sequence'
...
Merge changes for pull request #2248
2013-10-31 19:53:51 -04:00
mark_story
9e4ac31dc3
Correctly identifier quote column names before adding them to queries.
...
Closes #2248
2013-10-31 19:53:42 -04:00
davidsteinsland
94998763a5
Fixing whitespace
2013-10-31 23:58:52 +01:00
davidsteinsland
e68a61c375
Added configurable default value to Hash::get()
2013-10-31 23:31:48 +01:00
Mark Story
e5c2d4f49c
Merge pull request #2255 from rchavik/2.5-redis-dbnumber
...
RedisEngine: Support for selecting database number
2013-10-31 07:53:10 -07:00
Rachman Chavik
fb436644c3
RedisEngine: Support for selecting database number
...
Closes GH-2254
2013-10-31 20:45:39 +07:00
Mark
2d50837e85
Merge pull request #2252 from bcrowe/hotfix-retrieve
...
Correct spelling of retrieve
2013-10-30 20:15:47 -07:00
Bryan Crowe
94d7ac1dd6
Correct spelling of retrieve
2013-10-30 23:13:07 -04:00
Mark Story
5bd31621c1
Merge pull request #2250 from luissquall/fix-cookie-explode
...
Parse cookie values "{}" & "[]" as array
2013-10-30 17:27:12 -07:00
Luis Ramos
e33653a8d7
Add test case
2013-10-30 16:06:27 -06:00
Luis Ramos
db63ba2d8f
Parse cookie values "{}" & "[]" as array
2013-10-30 15:26:50 -06:00
mark_story
aaac360833
Merge branch 'master' into 2.5
2013-10-30 14:58:20 -04:00
Mark Story
d6f5f2f0bb
Merge pull request #2244 from dereuromark/2.5-debugger
...
Pass depth through for Debugger::dump().
2013-10-30 11:26:28 -07:00
Zach Gambino
927a4933d1
Fix for #2247 | Use correct column when calculating next sequence value
...
See #2247 for more details.
2013-10-30 11:25:06 -07:00
euromark
fecbef5949
Pass depth through for Debugger::dump().
2013-10-30 18:31:48 +01:00
Mark Story
9d87f6fcb5
Merge pull request #2239 from bcrowe/hotfix-strictTimeCompare
...
Update date comparisons to be strict in CakeTime
2013-10-29 20:14:19 -07:00
Bryan Crowe
507bb44301
Update date comparisons to be strict in CakeTime
2013-10-29 23:02:14 -04:00
mark_story
16be5722ba
Fix COUNT(DISTINCT x) queries from getting corrupted in Sqlserver.
...
Add into the tower of hacks that is the SQL generation and stop breaking
COUNT(DISTINCT foo) style queries. Previously these would be converted
into DISTINCT COUNT(foo) which will give the non-distinct results.
2013-10-29 23:01:55 -04:00
mark_story
0f8dae55c9
Add missing trim() around Sqlserver queries.
...
This solves issues with queries failing.
Fixes #2222
2013-10-29 23:01:49 -04:00
Mark Story
245c8eb8be
Merge pull request #2236 from bcrowe/hotfix-timezoneParam
...
Make use of timezone parameter in CakeTime::dayAsSql()
2013-10-29 18:02:25 -07:00
Bryan Crowe
00c5e88570
Make use of timezone parameter in CakeTime::dayAsSql()
2013-10-29 20:29:01 -04:00
mark_story
525efcb808
Remove use of deprecated constants.
...
Fixes #2232
2013-10-29 17:49:16 -04:00
ADmad
d9ca148499
Merge branch 'master' into 2.5
...
Conflicts:
CONTRIBUTING.md
lib/Cake/Model/Model.php
lib/Cake/VERSION.txt
2013-10-30 02:34:09 +05:30
ADmad
93cd458144
Changed to UNIX line ending
2013-10-30 02:27:49 +05:30
mark_story
a098ff28b8
Update doc block and remove inline assignment.
2013-10-29 12:32:20 -04:00
José Lorenzo Rodríguez
bd8f6e3d06
Merge pull request #2219 from zoghal/2.x-fix-download-multi-connection
...
2.x fix download multi connection/optimise serve file
2013-10-29 05:02:09 -07:00
mark_story
2d483f08ef
Shift script install files around to put .bat first.
...
Hopefully this addresses installation issues on windows using composer.
Fixes #2145
2013-10-28 23:19:17 -04:00
mark_story
a753718387
Update docs for CookieComponent::delete().
...
Refs #2182
2013-10-28 23:13:51 -04:00
mark_story
07f4779efe
Fix cookie component being inconsistent about writes.
...
Instead of treating multi-key and single key writes differently, they
should be treated consistently to allow simpler and more consistent interactions
with the stored data. This also results in fewer cookies being sent
across the wire which is an added benefit.
Fixes #2182
2013-10-28 23:13:51 -04:00
ADmad
eef2d919af
Merge pull request #2225 from bcrowe/hotfix-cakephp
...
Change Cake to CakePHP
2013-10-28 20:05:15 -07:00
Bryan Crowe
8eb6652fd7
Change Cake to CakePHP
2013-10-28 22:14:50 -04:00
Mark Story
f700ac0909
Merge pull request #2199 from ravage84/gitattributes
...
Added a .gitattributes file to set the line ending behavior when checkin...
2013-10-27 20:24:03 -07:00
Saleh Souzanchi
8844e54647
Merge remote-tracking branch 'cakephp/master' into 2.x-fix-download-multi-connection
2013-10-28 03:35:44 +03:30
Saleh Souzanchi
cc0c65d7ea
update tests
2013-10-28 02:24:58 +03:30
Saleh Souzanchi
7c4a698bde
update tests
2013-10-28 02:11:49 +03:30
Saleh Souzanchi
ab96ed56f3
fix multi connection/part downloading file
2013-10-28 01:06:33 +03:30
Saleh Souzanchi
459de09144
optimise download file
2013-10-28 01:03:06 +03:30
Saleh Souzanchi
bfde2d136f
fix spell of contentType
2013-10-28 00:49:40 +03:30
