Commit graph

15140 commits

Author SHA1 Message Date
mark_story
94815a74f1 Add ordering to prevent occasional pgsql failures. 2013-06-21 17:47:08 -04:00
José Lorenzo Rodríguez
c7ba2d5f57 Merge pull request #1367 from ravage84/patch-1
Fixed typo in AuthComponent::redirectUrl
2013-06-21 07:51:42 -07:00
Marc Würth
2418ea0a57 Fixed typo in AuthComponent::redirectUrl 2013-06-21 16:49:31 +02:00
mark_story
3867dec513 Merge branch 'luksm-master'
Closes #GH-1352
2013-06-19 15:07:27 -04:00
mark_story
68db74d32d Cleanup from previous commit.
Refs #GH-1352
2013-06-19 15:06:51 -04:00
Lucas Machado
dc3f9113b0 Fix to the date input year field
Create the field if no value is informed only to the maxYear and not to
the current date.
2013-06-19 15:05:15 -04:00
Mark Story
691288accc Merge pull request #1362 from dereuromark/master-cake-session
cake session clarification
2013-06-18 15:05:00 -07:00
Mark Story
406b8b8ae1 Merge pull request #1361 from dereuromark/master-form-helper-datetime
assert proper array access for _dateTimeSelected()
2013-06-18 15:02:20 -07:00
euromark
1b1943954b CakeSession improvements 2013-06-18 23:49:42 +02:00
euromark
eb13242680 assert proper array access for _dateTimeSelected() 2013-06-18 09:39:43 +02:00
mark_story
111bfa43d4 Fix incorrect autolinking when urls end at HTML tags.
Fixes #3879
2013-06-15 22:01:29 -04:00
mark_story
fe809cd85d Remove undocumented magic features for IIS.
Undocumented, untested features break very easily. It is best to not
have them where possible.
2013-06-13 18:01:11 -04:00
euromark
4671f235ad duplicate line removed 2013-06-13 14:15:00 +02:00
José Lorenzo Rodríguez
2f93d781ad Merge pull request #1349 from renansaddam/smtpTransportReturnPath
Using Return-Path email address in MAIL FROM instead of a header in SmtpTransport
2013-06-13 05:05:36 -07:00
mark_story
e2d69402e7 Remove dead view cache code.
Now that cache files contain the response headers, this is no longer
needed. Remove what is now duplicate code.

Refs #2358
2013-06-12 21:30:42 -04:00
Mark Story
e454f2d2a3 Merge pull request #1334 from thegallagher/2.3-cache-fix
Fix content-type header in cached views.

Fixes #2358
2013-06-12 18:27:42 -07:00
Mark Story
57d8c6b412 Merge pull request #1350 from dereuromark/master-post-link-doc-block
doc block formhelper postLink
2013-06-12 09:37:08 -07:00
euromark
b5b8885096 doc block formhelper postLink 2013-06-12 18:14:02 +02:00
Mark Story
d52c401ff2 Merge pull request #1348 from thomseddon/consistent-timestamps
Unify modified/created times. Both the created/updated timestamps will reflect the same point in time now.
2013-06-12 07:13:48 -07:00
Thom Seddon
305b3f4688 Unify modified/created times
The former implementation meant that it was not guarantee that
the times automatically generated for the modified/created fields
would be exactly the same for a given operation.
2013-06-12 13:51:56 +01:00
Renan Gonçalves
796e4b45dd Using Return-Path email address in MAIL FROM instead of a header in SmtpTransport.
The Return-Path header should not be present on the SMTP transaction, this header is set by the time of final delivery.
Quote RFC2821:
> When the delivery SMTP server makes the "final delivery" of a message, it inserts a return-path line at the beginning of the mail data. This use of return-path is required; mail systems MUST support it. The return-path line preserves the information in the from the MAIL command.
2013-06-12 11:31:49 +02:00
Mark Story
3fb9c84ce1 Merge pull request #1346 from djbobke/unit-locale-fixes
Fix locale for a lot of unittests
2013-06-11 15:00:09 -07:00
Rik van der Heijden
e7d2892e81 Fixed unit-test locales 2013-06-11 20:18:40 +02:00
Mark Story
bbcc7b2335 Merge pull request #1343 from Phally/patch-1
Minor optimization of CakeEmail::_wrap().
2013-06-10 16:57:34 -07:00
Frank de Graaf
f79a258a64 Minor optimization of CakeEmail::_wrap(). 2013-06-11 00:53:25 +03:00
Mark Story
e77d49f554 Merge pull request #1342 from dereuromark/master-coding-standards
incorrect tab to space - whitespace coding standards
2013-06-09 20:00:46 -07:00
mark_story
d10df32a44 Update version number to 2.3.6 2013-06-09 22:41:41 -04:00
euromark
42777b7809 incorrect tab to space - whitespace coding standards 2013-06-09 21:01:01 +02:00
Mark Story
dd28b2396d Merge pull request #1341 from dereuromark/master-coding-standards
Coding standards
2013-06-09 08:49:49 -07:00
euromark
4518624187 more whitespace coding standard corrections 2013-06-09 17:39:48 +02:00
euromark
a6f065e7a2 coding standards whitespace and single quote 2013-06-09 17:20:08 +02:00
euromark
f6aedea271 coding standards elseif 2013-06-09 17:12:46 +02:00
mark_story
e5b1182a0d Only delete files that have a matching group + prefix.
Fixes #3873
2013-06-08 22:42:41 -04:00
Mark Story
0f38dbd485 Merge pull request #1338 from aymericderbois/FixErrorWithZeroValueXml
Fix bug in Xml::_createChild Method
2013-06-08 17:20:16 -07:00
Aymeric Derbois
0cfdb87cdf Fix a problem of tag values which is not taken into account
(when equal to zero) when passing an array to XML object.
2013-06-09 00:52:06 +02:00
mark_story
e527eab5aa Add missing call to parent::setUp() 2013-06-08 09:47:46 -04:00
Mark Story
5cdd11cb38 Merge pull request #1336 from djbobke/caketimetest-locale
Fix locale for CakeTimeTest when configured different locale in app
2013-06-08 06:45:20 -07:00
Mark Story
ac5a6ddf8e Merge pull request #1324 from dereuromark/master-test-cases
remove $name where not necessary
2013-06-08 06:44:28 -07:00
Rik van der Heijden
0946a7799a Fix locale for CakeTimeTest when configured different locale in app 2013-06-08 10:25:28 +02:00
euromark
394bf1054d remove name attribute where not necessary, clean up doc blocks 2013-06-08 04:29:08 +02:00
Mark Story
b75449df9e Merge pull request #1335 from arnold-almeida/master
Use error() instead of err() for bevity
2013-06-07 03:59:44 -07:00
Arnold Almeida
dacf7e0ebe Update FixtureTask.php
Using err() does not stop shell output when used in the context of a script. 

Also no nice color syntax to indicate that there was an error with one of the fixture generations.

Using error() fixes that.
2013-06-07 14:21:35 +08:00
Jose Lorenzo Rodriguez
f14c55916f Repeating previous change for SQLite, so it passes on PHP 5.5 2013-06-06 18:12:07 +02:00
Jose Lorenzo Rodriguez
04a6bfbda6 Fixing postgres test for PHP 5.5 2013-06-06 17:55:55 +02:00
Jose Lorenzo Rodriguez
51af8800f2 Rewriting assertion to account for the actual case and not breaking in
PHP 5.5
2013-06-06 17:45:52 +02:00
David Gallagher
e222b3b78e Remove trailing space 2013-06-07 01:01:33 +10:00
David Gallagher
0ada093295 Set content-type to xml to replicate existing behaviour 2013-06-07 00:28:28 +10:00
David Gallagher
0eead76d4b Fix content-type header in cached views. Fixes issue #2358 2013-06-06 23:33:51 +10:00
Mark Story
e26a05ce04 Merge pull request #1235 from ADmad/2.3-caketime
Fix datetime comparison in relative datetime functions.
2013-06-05 06:12:50 -07:00
José Lorenzo Rodríguez
2416cab3fb Merge pull request #1329 from ceeram/master-travis
update travis.yml to test on php 5.5
2013-06-05 04:23:22 -07:00