Commit Graph

883 Commits

Author SHA1 Message Date
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
medmunds
1b47ee93e4 Add simple tests for admin views.
Make sure the admin views load without error. (Not really trying to test content right now.)

This includes failing test cases for:
* brack3t/Djrill#8: admin.autodiscover() fails without django-adminplus or DjrillAdminSite
* brack3t/Djrill#14: Django 1.5 doesn't support adminmedia template tag
2012-12-05 15:52:02 -08:00
medmunds
cf56fd4a23 Don't waste Travis resources testing Django 1.5 on python 2.6 2012-12-05 11:17:21 -08:00
medmunds
38492e3ea4 Travis: can't test python 3 yet -- problem with requests setup script
kennethreitz/requests#939
kennethreitz/requests#916
2012-12-05 11:14:10 -08:00
medmunds
8c4c3b95e4 Travis: catch DeprecationWarnings 2012-12-05 10:50:21 -08:00
medmunds
e95448d58c Add testing on (prerelease) Django 1.5 (including python 3.2) 2012-12-05 10:32:08 -08:00
medmunds
5555f33fa9 Merge branch 'master' of https://github.com/brack3t/Djrill into travis_ci 2012-12-05 10:22:38 -08:00
Kenneth Love
6500de8173 version bump 2012-12-04 17:30:35 -08:00
Kenneth Love
da37c4c750 Update djrill/mail/__init__.py
Defaulting `preserve_recipents` to False.
2012-12-04 17:29:20 -08:00
Kenneth Love
d112b278c5 version bump 2012-12-04 16:35:28 -08:00
Kenneth Love
9a1ccb325f Merge pull request #12 from jarcoal/master
preserve_recipients
2012-12-04 16:34:49 -08:00
Jared Morse
2eba028a1a DjrillBackend preserve_recipients 2012-12-03 18:55:05 -08:00
Jared Morse
7827352da1 preserve_recipients parameter in DjrillMessage 2012-12-03 18:52:58 -08:00
medmunds
a10ea06f47 Fix Travis build-status image url 2012-11-29 11:03:03 -08:00
Kenneth Love
0872135847 Merge pull request #11 from medmunds/travis_ci
Configure travis-ci.org tests
2012-11-24 13:53:43 -08:00
medmunds
b2fdfb7805 Configure travis-ci.org tests
Test Django 1.2 and 1.3; Python 2.6 and 2.7

Don't bother testing Python 2.5 -- it requires an older version of
requests (that doesn't depend on json).

Don't bother testing Django 1.2 -- it requires changes to ``assertRaises``
in the test cases (because the context-manager version of assertRaises is
part of unittest2, which appears in Django 1.3+ or Python 2.7+).

Don't bother testing Django 1.5 (yet).
2012-11-24 12:41:02 -08:00
Kenneth Love
2aa7da9353 Merge pull request #6 from medmunds/parse_sender
Support "Display Name <from@example.com>" sender email address
2012-11-23 10:55:13 -08:00
medmunds
efedc6813f Merge branch 'parse_sender' of github.com:medmunds/Djrill into parse_sender
Conflicts:
	djrill/mail/backends/djrill.py
	djrill/tests.py
2012-11-23 10:51:18 -08:00
medmunds
d9cb23b003 Support from_name in "from_name <email>" sender address.
Allows specifying the sender's display name as part of the from email address,
without requiring use of the DjrillMessage class:

    send_mail('Subject', 'Message', 'From Name <from@example.com>',
              ['Recipient #1 <to1@example.com>', 'to2@example.com'])

(This matches the behavior of Django's default SMTP backend.)

Cherry-picked from:
medmunds/Djrill@46cd5c9d: Support "realname <email>" sender address
medmunds/Djrill@cd4e57cc: Support "realname <email>" sender address - fix for using DjrillMessage
medmunds/Djrill@16f8efc9: Add tests for "Display Name <email@example.com>" addresses
2012-11-23 10:47:20 -08:00
Kenneth Love
5a986fe5b5 removed other mention of ADMIN_MEDIA_PREFIX 2012-11-23 10:00:13 -08:00
Kenneth Love
0a74ddfdf7 typo 2012-11-23 09:56:12 -08:00
Kenneth Love
a2a9648cad added LICENSE file 2012-11-23 09:54:44 -08:00
Kenneth Love
e3ed12205e Merge pull request #10 from medmunds/clarify_license
Note BSD license in readme and setup.py package classifiers.
2012-11-23 09:53:30 -08:00
Kenneth Love
2aaa72edaf Merge pull request #9 from medmunds/admin_remove_verify_sender
Remove obsolete admin related to sender verification
2012-11-23 09:53:07 -08:00
Kenneth Love
4624bb4bf3 Merge pull request #7 from medmunds/core_message_objects
Support Django standard EmailMessage objects
2012-11-23 09:51:27 -08:00
Kenneth Love
ab753c4d41 Merge pull request #5 from medmunds/backend_tests
Testing for backend API calls (using mock); add runtests.py.
2012-11-23 09:48:26 -08:00
medmunds
e42259d479 Note BSD license in readme and setup.py package classifiers.
BSD license assumed based on the line ``license="BSD"`` found
in the original setup.py.

Cherry-picked from medmunds/Djrill@b3b44c1c
2012-11-21 14:52:57 -08:00
medmunds
052f54113e Remove obsolete admin related to sender verification
(Also match admin view method signatures to base classes and remove
unused imports while we're in there.)

Cherry-picked from medmunds/Djrill@ce69fd78
2012-11-21 14:46:32 -08:00
medmunds
c78bbc6ced [minor cleanup] Allow html from any EmailMultiAlternatives (not just DjrillMessage) 2012-11-16 11:07:15 -08:00
medmunds
c23696a590 Allow html from any EmailMultiAlternatives (not just DjrillMessage)
Includes type-checking on alternative message part, and switches
to ValueError (rather than ImproperlyConfigured) for unacceptable
alternatives.

[Also fixes bug where fail_silently=True wasn't respected.]

Cherry-picked from: medmunds/Djrill@faf53a1a0
(and parts of medmunds/Djrill@62d48c5f)
2012-11-15 16:17:16 -08:00
medmunds
1901fd444e Allow extra headers from any EmailMessage (not just DjrillMessage)
Also adds test case for basic functionality on django.core.mail.EmailMessage.

Cherry-picked from: medmunds/Djrill@f0503783f
2012-11-15 15:49:08 -08:00
medmunds
f0ebbf6dfa Support from_name in "from_name <email>" sender address.
Allows specifying the sender's display name as part of the from email address,
without requiring use of the DjrillMessage class:

    send_mail('Subject', 'Message', 'From Name <from@example.com>',
              ['Recipient #1 <to1@example.com>', 'to2@example.com'])

(This matches the behavior of Django's default SMTP backend.)

Cherry-picked from:
medmunds/Djrill@46cd5c9d: Support "realname <email>" sender address
medmunds/Djrill@cd4e57cc: Support "realname <email>" sender address - fix for using DjrillMessage
medmunds/Djrill@16f8efc9: Add tests for "Display Name <email@example.com>" addresses
2012-11-15 15:03:26 -08:00
Rafael E. Belliard
008b6cfa36 Provide a way to block admin.py when django-adminplus isn't loaded. 2012-11-13 17:05:50 -04:00
medmunds
1bec172611 Testing on backend API calls, using mock; add runtests.py.
Cherry-picked from:
8c26807a - Add runtests.py for testing separately from other Django apps
cd8504b1 - Make tests compatible with setuptools
4ac65b78 - Set up testing on the backend API calls, using mock
2012-10-31 18:15:54 -07:00
Kenneth Love
442229d08d added AUTHORS.txt. bumped version to 0.1.2 2012-10-31 14:17:37 -07:00
Kenneth Love
0abdf27cb9 Merge pull request #3 from medmunds/remove_verify_sender
Remove verify sender
2012-10-31 13:45:33 -07:00
medmunds
487c5c926b Merge branch 'remove_verify_sender' of github.com:medmunds/Djrill into remove_verify_sender
Conflicts:
	djrill/mail/backends/djrill.py
2012-10-31 12:03:00 -07:00
medmunds
5602fc5314 Backend: Remove obsolete api_verify altogether.
Remove connection management (remnant of sender verification, and
didn't match Django email backend signatures).
Reformat inherited patch to 80-char line width.
Consistent int return type from send_messages.
2012-10-31 11:51:47 -07:00