Commit Graph

904 Commits

Author SHA1 Message Date
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
medmunds
7b61302dc2 Setup: list supported Python and Django versions; don't include entire license file 2013-03-05 15:46:06 -08:00
medmunds
9211c74144 Clean up version numbering and readme/description/docs sharing 2013-03-05 15:33:52 -08:00
Mike Edmunds
51d45353ee Merge pull request #31 from brack3t/inline_css
Support Mandrill inline_css sending option
2013-03-05 14:13:35 -08:00
medmunds
13c6125bda Support Mandrill inline_css sending option 2013-03-05 13:57:51 -08:00
Mike Edmunds
f881e42d31 Merge pull request #30 from brack3t/docs
Break up readme into docs; add to readthedocs.org
2013-03-04 21:28:10 -08:00
medmunds
21acb71642 Unified version: Python 3-compatible replacement for execfile 2013-03-04 21:13:19 -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
ea72b2d790 DRY up duplicate content in the readme and docs index page.
* Don't maintain similar overview in README.rst and docs/index.rst -- instead just include relevant portions of readme in the docs
* Patch up README version numbers and doc links in setup.py long_description to freeze them to the version being setup
* Suppress the Travis build status indicator in the docs and PyPI, since it can't be frozen to the specific version in question
2013-03-04 20:25:10 -08:00
medmunds
28538a5391 Docs: break apart the lengthy readme into organized docs
Also sphinx-ify where appropriate, and lots of general cleanup/editing.
2013-03-04 20:24:26 -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
medmunds
618729b444 Docs: initial sphinx-quickstart 2013-03-02 17:06:54 -08:00
Mike Edmunds
a2139d488e Merge pull request #27 from brack3t/embedded_images
Support inline images
2013-03-01 15:12:23 -08:00
medmunds
09de5faebe Support embedded images.
Treat image attachments with a Content-ID header as embedded, rather than ordinary attachments. (Rationale is that you must set the content-id to be able to refer to the image within your html, so that's a reasonable indicator to handle it as embedded.)
2013-03-01 13:58:07 -08:00
Mike Edmunds
4e48b0b3d0 Merge pull request #29 from brack3t/support_all_attachments
Don't filter attachment types
2013-02-28 17:52:22 -08:00
Mike Edmunds
114cc6fd2b Merge pull request #28 from brack3t/django_15_final
Travis: test against Django 1.5 final
2013-02-28 17:49:46 -08:00
medmunds
92d413f5ae Don't filter attachment types
Mandrill dropped filtering on attachment mimetypes, so stop enforcing this in Djrill.
Fixes #26
2013-02-28 17:47:47 -08:00
medmunds
5eae484561 Travis: test against Django 1.5 final 2013-02-28 17:30:22 -08:00
medmunds
921baab602 Version 0.3.1 2013-01-13 08:17:41 -08:00
medmunds
ed3249cede Correct name/content lists for template_content, merge_vars, global_merge_vars.
Fixes #24.
2013-01-13 08:16:40 -08:00
Mike Edmunds
6480e4f361 Merge pull request #23 from brack3t/v030
Version 0.3.0
2013-01-12 14:41:28 -08:00
medmunds
9380b1d8c9 Prep for 0.3.0 release
- Update version numbers
- Release notes
- Update authors
2013-01-12 14:20:40 -08:00
medmunds
860ebcdc44 Python 3.2 (but not 3.3) b64decode requires bytes not str 2013-01-12 14:00:34 -08:00
medmunds
86b9711f2c setup: close license, readme files 2013-01-12 13:49:35 -08:00
medmunds
ac0614a633 More Python 3.2 fixes - attachment encoding 2013-01-12 13:32:57 -08:00
medmunds
b4f2866f0f Python 3.2 fixes
- Absolute imports
- Unicode strings
2013-01-12 11:45:44 -08:00