Commit Graph

229 Commits

Author SHA1 Message Date
medmunds
1e44392b13 Allow all extra message headers in send.
Mandrill has relaxed previous API restrictions on headers.
Fixes #58.
2014-01-25 11:58:12 -08:00
medmunds
6ebd5d1342 Docs: remove references to "approved sending domains".
Mandrill dropped the requirement for pre-approving the from_email address a while back.
2014-01-25 11:36:46 -08:00
medmunds
ec7a302252 Master is now 0.9dev 2014-01-12 11:28:54 -08:00
medmunds
881b4842ff Prep for 0.8 release 2014-01-12 11:14:33 -08:00
medmunds
3a080bf557 Require Django>=1.3
Djrill is known not to work on Django 1.2. (You could probably backport it without too much difficulty, but you would also run into requests compatibility issues.)
2014-01-12 11:02:54 -08:00
Mike Edmunds
cd03ab691c Merge pull request #55 from erichennings/master
Add mandrill_response property to EmailMessage
2014-01-12 10:50:04 -08:00
Eric Hennings
3a6f3ec4c4 Fix tests broken for python 3.0 (no u’strings’) 2014-01-06 08:33:36 -08:00
Eric Hennings
e1c78ec197 Add the Mandrill send API response to EmailMessage as a property, mandrill_response, when a message is sent. For errors, set mandrill_response to None. Add tests & docs. 2013-12-22 14:12:57 -08:00
Mike Edmunds
08141a3003 Merge pull request #53 from zsiciarz/patch-1
Fixed link to Github in the docs.
2013-11-26 07:49:32 -08:00
Zbigniew Siciarz
30b5ef3016 Fixed link to Github in the docs. 2013-11-26 11:30:36 +01:00
medmunds
b1b049962c Django 1.6 released 2013-11-09 10:43:40 -08:00
medmunds
551de88604 Start 0.8 development
[ci skip]
2013-10-20 10:50:30 -07:00
medmunds
cb802a2b7e Docs: note added in 0.7 for new send options. 2013-10-19 13:32:09 -07:00
medmunds
12426204a5 Support important, view_content_link, return_path_domain, subaccount.
Closes #49.
2013-10-19 13:24:56 -07:00
medmunds
b26ba42e77 Support async, ip_pool, and send_at.
Closes #40.
Closes #48.
2013-10-19 13:09:05 -07:00
medmunds
f565a4c294 Mandrill requires template_content field for send-template.
Fixes #47.
2013-10-19 11:41:20 -07:00
medmunds
43dd289a16 Test against Django 1.6b4 2013-10-19 11:26:34 -07:00
Mike Edmunds
d5ff61e710 Merge pull request #45 from texastribune/support-html-alternate-content
Fix: Djrill assumes message content type is text
2013-10-19 11:12:07 -07:00
crccheck
393d6e7fa8 Fix: html messages were sent as text
If you followed the instructions at:
<https://docs.djangoproject.com/en/1.5/topics/email/#sending-alternative-content-types>,
djrill would send the body as 'text' instead of 'html', resulting in
ugly emails.

This also fixes how `[auto_text]` could be set, but couldn't do anything.
If you wanted to use `auto_text=True`, you would have to send a null
body and then `attach_alternative` your real body. I didn't add a test
case for this because they're like... orthogonal..., and gets into
behavior testing vs unit testing.

  [auto_text]: https://djrill.readthedocs.org/en/master/usage/sending_mail/#auto_text
2013-09-26 15:32:55 -05:00
crccheck
f5465700a8 Add: failing test for html only messages 2013-09-26 15:31:28 -05:00
medmunds
8b0e475125 Bump master to 0.7dev 2013-06-15 15:51:11 -07:00
medmunds
1966de2cad Test against Django 1.6 alpha 2013-06-15 15:44:05 -07:00
medmunds
1a2fc1be2c Add Jens Alm to contributor list 2013-06-15 15:43:14 -07:00
Mike Edmunds
a0d6a82bdc Merge pull request #39 from ProReNata/master
Added support for signed webhooks
2013-06-15 14:33:23 -07:00
Jens Alm
807f38a240 Cleaned up .gitignor, PEP-8 issues and documentation 2013-06-02 11:11:37 +02:00
Jens Alm
a0da0ea713 Actually handling the correct headers 2013-05-30 13:10:58 +02:00
Jens Alm
4e81e5d5e8 Added byte/str compatibility for python 3 2013-05-30 11:21:05 +02:00
Jens Alm
bbfaf2c8d8 Fixed python 3.2 unicode issues 2013-05-30 10:57:34 +02:00
Jens Alm
e73c404427 Added support for signed webhooks
See
http://help.mandrill.com/entries/23704122-Authenticating-webhook-request
s
2013-05-30 10:52:13 +02:00
Mike Edmunds
32c8a1643b Merge pull request #36 from rodbegbie/master
Documentation fix: merge_vars
2013-04-28 12:11:05 -07:00
Rod Begbie
ee2af9e2b7 Correct "merge_vars" name in docs
Docs incorrectly gives the per-recipient merge variables attribute name
as "recipient_merge_vars" instead of the correct name "merge_vars"
2013-04-26 18:13:50 -07:00
medmunds
be9b2b8e7c Bump master version 2013-04-17 16:13:23 -07:00
medmunds
c3da043260 Document webhook support 2013-04-17 16:02:29 -07:00
medmunds
33e1d17ac4 Webhook tests: verify signal handler definitely called, check data arg 2013-04-17 10:55:26 -07:00
Mike Edmunds
cae0a1e31f Merge pull request #33 from jpadilla/webhooks
Webhooks
2013-04-17 10:30:47 -07:00
José Padilla
2a661a6d8f Add: tests for webhook mixin and view 2013-04-14 20:36:33 -04:00
José Padilla
c63bbbd5cd Fix: webhook view post method
Gets the JSON data from the mandrill_events param.
Also returns a 400 error if there's any issues
loading the webhook request.
2013-04-14 20:35:52 -04:00
José Padilla
e2b36b1dde Raise exception if not using webhook secret 2013-04-14 19:32:28 -04:00
José Padilla
3496b206a0 Remove: Signal trigger on HEAD request 2013-04-14 19:31:29 -04:00
José Padilla
3c8355c620 Ignore *.egg files 2013-04-14 19:26:09 -04:00
José Padilla
51d1ace9a4 Fix: Exception string whitespace and formatting 2013-04-14 19:25:48 -04:00
José Padilla
c60a7c666f Add webhook handler 2013-04-11 14:57:53 -04:00
medmunds
717e048365 Add Mandrill send options auto_html, tracking_domain, signing_domain 2013-03-27 11:08:04 -07:00
medmunds
ab1de7be2a (Don't use python builtin 'vars' as a parameter name) 2013-03-27 11:08:04 -07:00
medmunds
64f32fbc72 Use python's json rather than Django's
django.utils.simplejson is deprecated; Python 2.6+ includes json.
Fixes #32.
2013-03-13 09:52:51 -07:00
medmunds
7484a39108 v0.4 released to PyPI; bump master version 2013-03-06 11:38:54 -08:00
medmunds
1d250d970d Readme: fix comments that broke PyPI; update Travis image url 2013-03-06 11:31:02 -08:00
medmunds
1fa8699389 Setup: oops, can't list supported Django versions 2013-03-05 18:40:02 -08:00
medmunds
63b5db7b9a Readme point to 'master' version of docs 2013-03-05 16:03:17 -08:00
medmunds
adb3ace00c Initial v0.4 release notes 2013-03-05 15:47:32 -08:00