Commit Graph

291 Commits

Author SHA1 Message Date
medmunds
76e29c0845 Support merge_language option.
Closes #84.
2015-01-16 13:48:39 -08:00
medmunds
1c4ee989f7 Fix "the JSON object must be str, not 'bytes'" on python3.
Closes #82.

* Test mock API responses (with actual content) in admin tests.
  (This exposes failure case, at least under Python 3.4/Django 1.6.)
* Parse json from Response.text, rather than raw Response.content
  bytes, in admin views.
2015-01-16 13:36:00 -08:00
medmunds
0b4a210031 Test against SimpleAdminConfig on Django>=1.7.
In test cases, use the same admin setup we recommend to users.
2015-01-16 13:29:43 -08:00
medmunds
11961b57e5 Use real Response object in DjrillBackendMockAPITestCase tests.
(Improves testing accuracy around API response encoding.)

* Add `six` as test dependency (six.BytesIO, six.b)
* Change MockResponse content to bytes (because HTTP responses
  are bytes, not strings)
2015-01-16 13:18:17 -08:00
Mike Edmunds
4754ef7650 Merge pull request #85 from freider/master
Security fix: Changes the default API endpoint to the https version
2015-01-16 10:41:47 -08:00
Elias Freider
95f143d8ca Changes the default API endpoint to the https version 2015-01-16 16:59:48 +01:00
medmunds
a0ce916092 Fix a couple of Sphinx docs warnings 2014-09-29 17:25:45 -07:00
medmunds
52430216fc Open v1.3 dev 2014-09-29 17:14:04 -07:00
medmunds
6e6a6aad56 Prep for 1.2 release
[ci skip]
2014-09-29 17:06:07 -07:00
medmunds
3acad587c9 Merge branch 'master' of https://github.com/brack3t/Djrill 2014-09-29 16:04:38 -07:00
Mike Edmunds
c3f3480024 Merge pull request #75 from pkimber/master
If missing 'from_email', then 'log_message' will fail to build
2014-09-29 16:04:31 -07:00
medmunds
019a37d7f5 Docs: update list of testing configurations
(That list is practically guaranteed to become outdated, so
just point to the Travis config file.)

[ci skip]
2014-09-29 15:56:34 -07:00
medmunds
49ad853ab3 Docs: suggest checking Mandrill error logs for API errors
[ci skip]
2014-09-29 15:48:31 -07:00
medmunds
79dac432c0 Add pointer to django.utils.log.AdminEmailHandler in docs.
Closes #73.

[ci skip]
2014-09-29 15:20:01 -07:00
medmunds
c6b171b671 Document Django 1.7 admin installation changes.
Closes #74.
2014-09-29 14:44:22 -07:00
medmunds
a8ff2ad39e Update tests, readme for Django 1.7 release 2014-09-29 12:03:37 -07:00
Patrick Kimber
0063fde2e5 if missing 'from_email', then 'log_message' will fail to build 2014-08-04 15:32:24 +01:00
medmunds
54d54a9e73 Correct Travis install for Django 1.7rc2
With 55dc242, fixes #71
2014-08-01 07:43:53 -07:00
medmunds
55dc242879 Fix tests in Django 1.7
Django 1.7 doesn't include session or auth middleware
in minimal default config. Djrill admin views require auth.
2014-07-28 08:27:55 -07:00
medmunds
6dcbf86a43 Travis: Django 1.7rc2; explicit build matrix
Switch to explicitly declaring build matrix, with the versions
of Python supported by each version of Django we handle.
(Exclusion list was becoming too complicated.)
2014-07-28 08:20:34 -07:00
Mike Edmunds
344e6013fd Merge pull request #70 from omerzimp/patch-1
Test Python 3.3, 3.4, and PyPy; test Django 1.7rc1
2014-07-17 18:29:50 -07:00
Omer Katz
44b51188a9 Added a note about PyPy support to the README file. 2014-07-15 11:54:54 +03:00
Omer Katz
a46ade6c94 Updated the package's classifiers. 2014-07-15 11:54:07 +03:00
Omer Katz
1191d659d1 Updated the build process.
The build now tests for newer Python 3.x versions and PyPy.
Also the build will now test itself against Django 1.7RC1 instead of the latest beta version.
2014-07-15 11:52:54 +03:00
medmunds
274408eb1f Include missing templatetags in distribution
Make manifest template more inclusive.
Fixes #67.
2014-06-04 08:03:18 -07:00
medmunds
19014a72b0 Open v1.2 development
[ci skip]
2014-05-28 21:33:17 -07:00
medmunds
fbbc84f98f Travis: _actually_ update Django 1.7 to b4
(Oops, Django project changed url convention.)
2014-05-28 21:26:46 -07:00
medmunds
ba803a553e Travis: _actually_ update Django 1.7 to b4 2014-05-28 21:20:10 -07:00
medmunds
2f7de8e6af Update release notes 2014-05-28 21:19:58 -07:00
medmunds
18e3b52574 Travis: update Django 1.7 to b4 2014-05-28 21:13:21 -07:00
medmunds
2c05647ada Travis: lose deprecated pip --use-mirrors 2014-05-28 21:12:41 -07:00
medmunds
62d15da00a Merge branch 'nikolay-saskovets-feature/use-mandrill-template-defaults' 2014-05-28 21:10:12 -07:00
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
Mike Edmunds
66ae927b4c Merge pull request #65 from winhamwr/unicode_attachments
`UnicodeEncodeError` with unicode attachments
2014-05-28 09:03:12 -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
Mike Edmunds
a5205786c7 Merge pull request #64 from kylegibson/issue_64
Require at least requests 1.0.0
2014-04-22 08:50:09 -07:00
Kyle Gibson
1c92edc665 Refs #64. Fixed requirement specification for requests 2014-04-21 13:43:45 -04:00
Kyle Gibson
07659aa121 Added Kyle Gibson to authors 2014-04-21 13:40:16 -04:00
Kyle Gibson
9eb8d13c3d Refs #64. Pegged requests to at least 1.0.0 2014-04-21 13:37:54 -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
3cfcc34bc1 Oops: don't test Django 1.7b1 under Python 2.6 2014-04-20 15:03:09 -07:00
medmunds
1e39e4d5c8 Start testing Django 1.7b1 2014-04-20 14:45:29 -07:00
medmunds
28c5a3a742 Fix PendingDeprecationWarning for cycle tag on Django 1.6+ 2014-04-20 14:44:25 -07:00