Commit Graph

135 Commits

Author SHA1 Message Date
medmunds
780d4f98f7 use_template_subject and use_template_from
Change "clear_subject" and "clear_from" to clarify expected usage.
Update docs.
Acknowledge contribution.
2014-05-28 21:09:28 -07:00
medmunds
78ff0af229 Merge branch 'feature/use-mandrill-template-defaults' of git://github.com/nikolay-saskovets/Djrill into nikolay-saskovets-feature/use-mandrill-template-defaults 2014-05-28 20:42:36 -07:00
nikolay.saskovets
3eb4582449 fix test 2014-05-16 07:57:53 -04:00
nikolay.saskovets
0e27a62f3c prepare for PR to mainstream (tests, docs, ...) 2014-05-16 07:37:51 -04:00
nikolay.saskovets
c3420d156e ability to use default Mandrill subject and from fields 2014-05-16 06:57:58 -04:00
winhamwr
f2a08894fa Fixed python 3.2 compatibility. 2014-04-23 18:37:46 -04:00
winhamwr
70dc022f77 Handle unicode attachment content in both python 2.X and python3. 2014-04-23 16:59:48 -04:00
winhamwr
4e0a0cca71 Added failing test showing that unicode attachments cause an error 2014-04-23 15:52:05 -04:00
medmunds
8815601b65 Use override_settings rather than mucking with settings in tests
Second attempt to address possible test sequencing issue around tests that alter settings. (Failures in Travis tests not reproducible locally.)

Back-ports override_settings from Django 1.4 for compatibility with Django 1.3.
2014-04-20 16:04:31 -07:00
medmunds
ea2499f92f Fix possible test-sequencing issue in DjrillMandrillSubaccountTests 2014-04-20 15:03:49 -07:00
medmunds
28c5a3a742 Fix PendingDeprecationWarning for cycle tag on Django 1.6+ 2014-04-20 14:44:25 -07:00
medmunds
09fe0b0e12 Open 1.1 development 2014-04-20 13:43:27 -07:00
medmunds
ba2302ae56 Subaccounts: Document setting; verify message option overrides global setting 2014-04-20 12:57:08 -07:00
Sameer Al-Sakran
3c7a69873f fix tests + add base send test 2014-04-14 11:45:24 -07:00
Michael Hobbs
21e8727b1d use MANDRILL_SUBACCOUNT to match the API field 2014-04-11 14:24:31 -07:00
Sameer Al-Sakran
cd8c2b8760 add subaccount support to djrill 2014-04-11 13:15:09 -07:00
medmunds
1707e2a665 Open dev branch for 1.0 2014-01-25 13:05:34 -08:00
medmunds
d7c06bb576 Better handling for cc and bcc recipients.
Fixes #59.
2014-01-25 12:35:23 -08:00
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
ec7a302252 Master is now 0.9dev 2014-01-12 11:28:54 -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
medmunds
551de88604 Start 0.8 development
[ci skip]
2013-10-20 10:50:30 -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
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
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
medmunds
be9b2b8e7c Bump master version 2013-04-17 16:13:23 -07:00
medmunds
33e1d17ac4 Webhook tests: verify signal handler definitely called, check data arg 2013-04-17 10:55:26 -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
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
9211c74144 Clean up version numbering and readme/description/docs sharing 2013-03-05 15:33:52 -08:00
medmunds
13c6125bda Support Mandrill inline_css sending option 2013-03-05 13:57:51 -08:00
medmunds
440e32529e Bump version (so readthedocs won't label updated docs as old "0.3.1") 2013-03-04 20:25:10 -08:00
medmunds
230011f818 Maintain version info in a single place.
http://stackoverflow.com/a/2073599/647002
2013-03-04 20:02:26 -08:00