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
medmunds
c550aacbb8
Travis: re-enable Python 3.2 testing
...
(Recent requests updates may have fixed Python 3 setup issues)
2013-01-12 10:50:44 -08:00
medmunds
241f9eeb2c
Readme: restore summary (from old long_description)
2013-01-12 10:48:37 -08:00
medmunds
6dc1eea74d
Readme: clean up "Django EmailMessage Support" section
2013-01-12 10:38:41 -08:00
medmunds
8de6b218b9
Handle bcc as Mandrill bcc_address, rather than additional to address
2013-01-12 10:26:42 -08:00
medmunds
8f9afdff7e
Move MANDRILL_API_URL to package root (out of backend)
2013-01-11 17:34:17 -08:00
medmunds
ad4b9f38ff
Raise NotSupportedByMandrillError for unsupported attachment mimetypes.
2013-01-11 17:26:09 -08:00
medmunds
18d27fdb21
Exception cleanup
...
Introduce djrill.NotSupportedByMandrillError for unsupported functionality (previously used generic ValueError).
Change to djrill.MandrillAPIError, derived from requests.HTTPError, for API error responses (previously used djrill.mail.backends.djrill.DjrillBackendHTTPError -- retained as equivalent for backwards compatibility).
2013-01-11 16:59:42 -08:00
medmunds
fac078ee18
Readme: Explain using multiple email backends
2013-01-11 15:23:08 -08:00
medmunds
0826e2b7b0
Readme: docs for send-template
...
(and break up the lengthy 'usage' section)
2013-01-11 14:51:37 -08:00
medmunds
4be12952a3
Add send-template tests (and fixes).
...
Add test cases for send-template.
Expand template_content dict into Mandrill's name/value array.
Don't send template_content as "None" if missing.
Clean up some variable names in the backend.
2013-01-11 13:28:49 -08:00
medmunds
207e94e6d0
Tests: add ability to check which Mandrill API endpoint was used.
...
Add DjrillBackendMockAPITestCase.assert_mandrill_called; use it in representative backend test cases.
(Also make get_api_call_data work with various ways of calling requests.post.)
2013-01-11 12:44:06 -08:00
medmunds
3b237a59db
Merge branch 'send-template' of git://github.com/peillis/Djrill into send_template
2013-01-09 12:39:18 -08:00
Mike Edmunds
b95d51a7f8
Merge pull request #22 from brack3t/attachments
...
Support attachments
2013-01-09 12:34:50 -08:00
Mike Edmunds
d0236dd5aa
(Readme rst * escapes)
2013-01-03 15:16:16 -08:00
medmunds
7eef68067d
Readme: Note Mandrill silently filters unsupported attachment types
2013-01-03 15:10:28 -08:00
medmunds
5b4f4c12cb
Support sending attachments
2013-01-03 13:52:41 -08:00
medmunds
e529fe682d
readme: add info on contributing
2013-01-03 10:51:57 -08:00
medmunds
d1b0e0a574
Tests: break apart tests.py into tests directory
2013-01-03 10:51:07 -08:00
medmunds
8a0fccdf53
setup: pull long_description and license from README and LICENSE files.
...
Ensures info on PyPI matches version being distributed there. (Avoids problem where docs on github are ahead of published version on PyPI.)
2013-01-03 10:16:19 -08:00
peillis
046987a934
adding the send-template call
2012-12-24 13:36:37 +01:00
Mike Edmunds
e4f805933c
Merge pull request #18 from medmunds/v020
...
v0.2.0
2012-12-11 13:51:17 -08:00
medmunds
c7f13ed5e5
Ignore sdist output
...
[ci skip]
2012-12-11 13:39:09 -08:00
medmunds
bc9e6212a6
Version 0.2.0
...
* Release notes in readme
* Update example in readme
* Note deprecation of DjrillMessage class
* Longer long_description for PyPI
* Update authors
* Bump version number (setup.py and __init__.py)
2012-12-11 13:19:21 -08:00
medmunds
2a2ca6c137
Unclosed <dl> in admin status.html
2012-12-11 10:55:01 -08:00
medmunds
b0da1cf953
DjrillMessage class fixes
...
* Don't crash if no tags
* Allow `None` to omit options entirely from Mandrill send call
* Default `preserve_recipients` to None (= use setting from Mandrill account)
* ImproperlyConfigured --> ValueError for bad tags
2012-12-11 10:50:08 -08:00
medmunds
9a6eb78db5
One more try on correct Travis-CI links
2012-12-11 10:28:12 -08:00
Mike Edmunds
79ace33e31
Merge pull request #13 from medmunds/mandrill_send_features
...
Expose most Mandrill API send features on EmailMessage objects
2012-12-10 11:40:58 -08:00
medmunds
0a2595d731
Add test to ensure Mandrill account settings not overridden by default.
...
Default behavior should be to not pass any options to the Mandrill send API that haven't been specifically requested by the caller.
2012-12-10 11:36:19 -08:00
medmunds
8aab5e31b7
Expose most Mandrill send features on EmailMessage objects.
...
* Supports additional Mandrill send-API attributes on any ``EmailMessage``-derived object -- see details in readme
* Removes need for MANDRILL_API_URL in settings (since this is tightly tied to the code)
* Removes ``DjrillMessage`` from the readme (but not the code or tests) -- its functionality is now duplicated or exceeded by standard EmailMessage with additional attributes
* Ensures send(fail_silently=True) works as expected
2012-12-10 11:36:18 -08:00
Mike Edmunds
7d658f2f00
Merge pull request #16 from medmunds/travis_ci
...
Travis: add Django 1.5 beta
2012-12-10 11:00:23 -08:00
Mike Edmunds
e7632c1344
Merge pull request #15 from medmunds/test_admin_views
...
Admin tests and fixes
2012-12-10 10:58:21 -08:00
medmunds
49238b28ae
Fix django.conf.urls.defaults deprecation warning in admin
...
(Test on Django 1.3, 1.4, 1.5b)
2012-12-05 16:06:12 -08:00
medmunds
5f0ff0cba2
Remove unused adminmedia template tag
...
Fixes brack3t/Djrill#14
2012-12-05 16:04:55 -08:00
medmunds
2c539141f6
Merge commit '008b6cf' into test_admin_views
...
Conflicts:
djrill/admin.py
2012-12-05 16:01:17 -08:00