Commit graph

78 commits

Author SHA1 Message Date
Graham Weldon
7b860debe4 This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
mark_story
554d5794ce Merge branch 'master' into 2.3 2012-12-19 21:18:52 -05:00
mark_story
7ad11f59bb Change line length in emails.
Use LINE_LENGTH_MUST instead of LINE_LENGTH_SHOULD. This
fixes a number of text wrapping issues caused by the narrower wrap
length.

Fixes #3151
Fixes #3473
2012-12-17 20:54:38 -05:00
Jose Lorenzo Rodriguez
c1551d9828 Merge branch 'master' into 2.3 2012-12-02 00:34:55 +01:00
Jose Lorenzo Rodriguez
da4fdbac3a Fixing failing test case 2012-12-02 00:34:26 +01:00
Ceeram
eadc3a75e5 fix coding standards 2012-11-21 15:39:03 +01:00
dogmatic69
408e619c9f Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
mark_story
59e948fb1b Merge branch 'master' into 2.3 2012-09-28 21:20:24 -04:00
mark_story
853d866c35 Remove port numbers from Message-id domains.
Fixes #3244
2012-09-28 21:20:14 -04:00
dogmatic69
b1f26b59a3 converting if ($foo != null) to if ($foo) 2012-09-21 23:30:43 +01:00
mark_story
571c8bc08c Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
d3105332dc Fix coding standards errors. 2012-09-01 12:14:15 +01:00
mark_story
728300786b Merge branch 'master' into 2.3 2012-08-30 19:43:11 +01:00
James Hall
20baeb83db Change to match coding standards 2012-08-26 02:11:43 +01:00
James Hall
a3b5065f8a Make sure the environment variable is set 2012-08-26 00:33:32 +01:00
James Hall
6c4ba233ba Fix testSendRenderWithImage when non running on port 80 2012-08-26 00:23:32 +01:00
mark_story
6ce4a3a1ec Add tests for contentDisposition flag.
Fixes #3042
2012-07-21 21:22:04 -04:00
mark_story
591022f182 Make test case use SERVER_NAME conditionally. 2012-07-05 22:56:45 -04:00
Simon East
de703a2692 Fix for CakeEmailTest.php that failed unless using 'localhost' 2012-07-06 11:59:39 +10:00
mark_story
13077a8f2f Add tests for previous commit. 2012-06-22 21:44:37 -04:00
Jose Lorenzo Rodriguez
51635c2ca6 Merge remote-tracking branch 'origin/2.1' into 2.2
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-06-06 11:06:06 -04:30
Rachman Chavik
8966f1b324 create CakeRequest in View instead of in CakeEmail 2012-06-04 22:21:41 +07:00
Rachman Chavik
9bafc5a3bb CakeEmail: create request object before rendering
Closes #2931
2012-06-04 09:18:29 +07:00
mark_story
0ed6752110 Fix coding standards. 2012-05-21 20:29:00 -04:00
Norio Suzuki
f816f6ae1b Supported japanese legacy charset and changed to use upper case charset in Content-Type line 2012-05-21 20:28:59 -04:00
Jose Lorenzo Rodriguez
bf0f5ab118 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
mark_story
2480ee1beb Fix coding standards. 2012-04-20 20:52:10 -04:00
euromark
a5c323064f domain configurable for mailing in CLI environment 2012-04-20 03:38:26 +02:00
mark_story
f8966a64f2 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
2012-04-09 21:55:02 -04:00
mark_story
c718a18218 Fix coding standards errors. 2012-04-08 21:01:25 -04:00
mark_story
18296d2bf6 Fix a few coding standards errors. 2012-04-02 23:19:05 -04:00
Norio Suzuki
26b93afc3c fixed CakeEmail::reset, no initialized charset and headerCharset property 2012-04-01 23:42:18 +00:00
Rachman Chavik
6fa30db504 CakeEmail can use theme when rendering template 2012-03-28 22:01:30 +07:00
Ceeram
d748fc7451 Merge branch '2.1' into 2.2 2012-03-23 16:32:04 +01:00
Kyle Robinson Young
90e7afbdc7 Correct parameter order of assertEquals and assertNotEquals 2012-03-22 23:37:12 -07:00
mark_story
c58b61c17b Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-03-18 21:26:45 -04:00
mark_story
d0733ceb00 Fix most coding standards in Case/Network 2012-03-16 22:19:01 -04:00
Norio Suzuki
358b84b577 Add charset() / headerCharset() methods to CakeEmail class 2012-03-16 12:54:30 +00:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
Kyle Robinson Young
22582aee63 Upgrade legacy uses of App::build() types 2012-02-18 04:31:29 -08:00
mark_story
0207a61e9b Move alias wrapping into _formatAddress()
Fixes #2502
2012-02-11 10:16:08 -05:00
mark_story
f02a3b0531 Wrap aliases containing , in ""
Fixes #2502
2012-01-25 21:03:03 -05:00
mark_story
4d73f4e6a1 Fix boundaries used in multi-part messages.
Inline attachments should use the multipart/related boundary.  Otherwise
sections will be incorrectly nested.

Fixes #2413
2012-01-11 20:44:42 -05:00
Mark Story
83b28c42cf Fix failing tests and missing boundary markers.
When sending html + text emails, there were duplicate multipart/alternative sections
and the trailing top level boundary was missing.
2011-12-27 23:38:21 -05:00
Mark Story
f366a9ff83 Add test for inline attachments. 2011-12-27 22:51:47 -05:00
Mark Story
0e4af546d6 Update sending attachments.
Both inline and external attachments, as well as mixed sets of
inline and external attachments should work now.  Re-built the internals
of message rendering to remove duplication and redundant code paths.

Fixes #2413
Fixes #2320
2011-12-27 22:51:47 -05:00
Mark Story
34eedcc017 Add a few regression tests for CakeEmail. 2011-12-27 22:51:47 -05:00