Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sunscrapers/django-templated-mail
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.2.0
Choose a base ref
...
head repository: sunscrapers/django-templated-mail
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
4 contributors

Commits on Oct 6, 2017

  1. Multiple API changes 

    Add template_name parameter to BaseEmailMessage constructor
Add context tests
Add mock for python 2.7 to tox dependencies
Update set_context_data into get_context_data
Update render to be invoked on send
Update tests for API changes
    @pszpetkowski
    pszpetkowski committed Oct 6, 2017
    Copy the full SHA
    be9045a View commit details

  2. Add base docs with installation and settings

    @pszpetkowski
    pszpetkowski committed Oct 6, 2017
    Copy the full SHA
    b6d0233 View commit details

  3. Docs: Add settings to index 

    Fix rst formatting
    @pszpetkowski
    pszpetkowski committed Oct 6, 2017
    Copy the full SHA
    069a527 View commit details

  4. Docs: fix settings code example

    @pszpetkowski
    pszpetkowski committed Oct 6, 2017
    Copy the full SHA
    8b3df9f View commit details

  5. Docs: Add templates syntax explanation and usage

    @pszpetkowski
    pszpetkowski committed Oct 6, 2017
    Copy the full SHA
    0815986 View commit details

  6. Update mock import for mock compat

    @pszpetkowski
    pszpetkowski committed Oct 6, 2017
    Copy the full SHA
    d9187a2 View commit details

  7. Update Pipfile and Pipfile.lock

    @pszpetkowski
    pszpetkowski committed Oct 6, 2017
    Copy the full SHA
    711648e View commit details

  8. Add examples app

    @pszpetkowski
    pszpetkowski committed Oct 6, 2017
    Copy the full SHA
    0700f5b View commit details

  9. Remove Python 3.3 from testing pipeline

    @pszpetkowski
    pszpetkowski committed Oct 6, 2017
    Copy the full SHA
    7ce65bf View commit details

  10. Add MANIFEST file

    @pszpetkowski
    pszpetkowski committed Oct 6, 2017
    Copy the full SHA
    ca8c234 View commit details

  11. Release 1.0.0 

    Update CHANGELOG with 1.0 notes
Update trove classifiers
    @pszpetkowski
    pszpetkowski committed Oct 6, 2017
    Copy the full SHA
    b5568e0 View commit details

  12. Update README with documentation note 

    Remove invalid installation notes
    @pszpetkowski
    pszpetkowski committed Oct 6, 2017
    Copy the full SHA
    898fbce View commit details

Commits on Oct 20, 2017

  1. Add MIT License

    @pszpetkowski
    pszpetkowski committed Oct 20, 2017
    Copy the full SHA
    389dc52 View commit details

Commits on Jan 4, 2018

  1. Add support for reply_to to send method 

    Remove cc and bcc from send signature in favor of kwargs
    @pszpetkowski
    pszpetkowski committed Jan 4, 2018
    Copy the full SHA
    1bca216 View commit details

  2. Add test for reply_to send kwarg

    @pszpetkowski
    pszpetkowski committed Jan 4, 2018
    Copy the full SHA
    09a2f79 View commit details

  3. Fix pep8 issues in docs conf

    @pszpetkowski
    pszpetkowski committed Jan 4, 2018
    Copy the full SHA
    e967bb5 View commit details

Commits on Jan 17, 2018

  1. added support for from_email field

    @dkainama
    dkainama committed Jan 17, 2018
    Copy the full SHA
    fe10b77 View commit details

  2. should be string

    @dkainama
    dkainama committed Jan 17, 2018
    Copy the full SHA
    c444134 View commit details

Commits on Jan 18, 2018

  1. Merge pull request #2 from dkainama/feature/from_email_support 

    Added support for from_email field to send method
    @pszpetkowski
    pszpetkowski authored Jan 18, 2018
    Copy the full SHA
    6d12a4a View commit details

Commits on Jan 23, 2018

  1. pass context to mixins

    @dkainama
    dkainama committed Jan 23, 2018
    Copy the full SHA
    d888516 View commit details

  2. super needs also extend on ContentMixin

    @dkainama
    dkainama committed Jan 23, 2018
    Copy the full SHA
    6de97fa View commit details

  3. helpers for mock mixins, added test for r extended context

    @dkainama
    dkainama committed Jan 23, 2018
    Copy the full SHA
    9e7332a View commit details

  4. union not working on 2.7

    @dkainama
    dkainama committed Jan 23, 2018
    Copy the full SHA
    c5b7964 View commit details

Commits on Jan 29, 2018

  1. Merge pull request #3 from dkainama/feature/pass-context-to-mixins 

    Feature: pass context to mixins on BaseEmailMessage
    @pszpetkowski
    pszpetkowski authored Jan 29, 2018
    Copy the full SHA
    5110a7d View commit details

  2. Add support for Django 2.0 

    Remove support for Django 1.10
    @pszpetkowski
    pszpetkowski committed Jan 29, 2018
    Copy the full SHA
    222a78f View commit details

  3. Update CHANGELOG 

    Remove Django 1.10 from docs
    @pszpetkowski
    pszpetkowski committed Jan 29, 2018
    Copy the full SHA
    4eb7bdb View commit details

  4. Add URLs for missing versions in CHANGELOG

    @pszpetkowski
    pszpetkowski committed Jan 29, 2018
    Copy the full SHA
    b11dcd3 View commit details

  5. Release 1.1.0 

    Update versions and copyright year in docs
    @pszpetkowski
    pszpetkowski committed Jan 29, 2018
    Copy the full SHA
    ea1d09b View commit details

Commits on Feb 1, 2018

  1. from_email returns None

    @dkainama
    dkainama committed Feb 1, 2018
    Copy the full SHA
    daaacc3 View commit details

  2. Merge pull request #5 from dkainama/hotfix/from_email_default_to_none 

    Fix: from_email should return None by default
    @pszpetkowski
    pszpetkowski authored Feb 1, 2018
    Copy the full SHA
    8bf682a View commit details

  3. Update from_email to use DEFAULT_FROM_EMAIL 

    Add unit test for DEFAULT_FROM_EMAIL setting
    @pszpetkowski
    pszpetkowski committed Feb 1, 2018
    Copy the full SHA
    aef63f8 View commit details

  4. Release 1.1.1 

    Update CHANGELOG
    @pszpetkowski
    pszpetkowski committed Feb 1, 2018
    Copy the full SHA
    bcadd81 View commit details

Commits on Dec 5, 2018

  1. Take into account parent templates when rendering mail content. Fixes #… 

    …10
    @hawi74
    hawi74 committed Dec 5, 2018
    Copy the full SHA
    d225ff7 View commit details

Commits on Dec 6, 2018

  1. Update supported environments

    @hawi74
    hawi74 committed Dec 6, 2018
    Copy the full SHA
    cee59f4 View commit details

  2. Update classifiers

    @hawi74
    hawi74 committed Dec 6, 2018
    Copy the full SHA
    cc29a72 View commit details

  3. Update automated tests environments

    @hawi74
    hawi74 committed Dec 6, 2018
    Copy the full SHA
    24c2b21 View commit details

  4. Fix Python 3.7 version

    @hawi74
    hawi74 committed Dec 6, 2018
    Copy the full SHA
    53671ec View commit details

Commits on Jan 10, 2019

  1. Merge pull request #14 from hawi74/update_deps 

    Update supported environments
    @zefciu
    zefciu authored Jan 10, 2019
    Copy the full SHA
    68e6897 View commit details

  2. Merge pull request #13 from hawi74/issue-10 

    Make templates extendable
    @zefciu
    zefciu authored Jan 10, 2019
    Copy the full SHA
    65e5a34 View commit details
27 changes: 13 additions & 14 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -5,32 +5,31 @@ python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"
- "3.7-dev"

env:
- DJANGO=1.8
- DJANGO=1.10
- DJANGO=1.11
- DJANGO=2.0
- DJANGO=2.1
- DJANGO=master

matrix:
fast_finish: true
include:
- python: "3.3"
env: DJANGO=1.8
- python: "3.6"
env: DJANGO=1.11
- python: "3.6"
env: DJANGO=master
- python: "3.7-dev"
env: DJANGO=1.11
- python: "3.7-dev"
env: DJANGO=master
exclude:
- python: "2.7"
env: DJANGO=2.0
- python: "2.7"
env: DJANGO=2.1
- python: "2.7"
env: DJANGO=master
- python: "3.4"
env: DJANGO=2.1
- python: "3.4"
env: DJANGO=master
allow_failures:
- python: "3.7-dev"
- env: DJANGO=master
- python: "3.7-dev"

install:
- travis_retry pip install -U tox-travis
39 changes: 35 additions & 4 deletions CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
@@ -6,21 +6,50 @@ This document records all notable changes to django-templated-mail.
This project adheres to `Semantic Versioning <http://semver.org/>`_.

---------------------
`0.2.0`_ (2015-09-22)
`1.1.1`_ (2017-02-01)
---------------------

* Bugfix: ``from_email`` does not fallback to ``DEFAULT_FROM_EMAIL``


---------------------
`1.1.0`_ (2017-01-29)
---------------------

* Add support for ``reply_to`` parameter in ``BaseEmailMessage.send`` method
* Add support for ``from_email`` parameter in ``BaseEmailMessage.send`` method
* Add support for Django 2.0
* Remove support for Django 1.10
* Fix passing context to email classes with context provided via mixin
* Fix invalid release years in release notes

---------------------
`1.0.0`_ (2017-10-06)
---------------------

* Breaking API: Update ``set_context_data`` to ``get_context_data``
* Add basic documentation
* Add basic examples
* Update templates rendering to happen on send
* Update dependencies
* Remove Python 3.3 from supported versions

---------------------
`0.2.0`_ (2017-09-22)
---------------------

* Add support for CC and BCC
* Update name of ``BaseEmailMessage.send_to`` to ``BaseEmailMessage.send``

---------------------
`0.1.1`_ (2015-09-15)
`0.1.1`_ (2017-09-15)
---------------------

* Bugfix: Issue with template nodes requiring template to be bound to context
* Bugfix: Issue with whitespaces around content blocks

---------------------
`0.1.0`_ (2015-09-15)
`0.1.0`_ (2017-09-15)
---------------------

* Initial release of the project. Its goal is to provide simple API for sending
@@ -30,4 +59,6 @@ This project adheres to `Semantic Versioning <http://semver.org/>`_.

.. _0.1.0: https://github.com/sunscrapers/django-templated-mail/compare/3bc71b3...0.1.0
.. _0.1.1: https://github.com/sunscrapers/django-templated-mail/compare/0.1.0...0.1.1
.. _0.2.0: https://github.com/sunscrapers/django-templated-mail/compare/0.1.1...0.2.0
.. _0.2.0: https://github.com/sunscrapers/django-templated-mail/compare/0.1.1...0.2.0
.. _1.0.0: https://github.com/sunscrapers/django-templated-mail/compare/0.2.0...1.0.0
.. _1.1.0: https://github.com/sunscrapers/django-templated-mail/compare/1.0.0...1.1.0
21 changes: 21 additions & 0 deletions LICENSE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2017 SUNSCRAPERS

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
2 changes: 2 additions & 0 deletions MANIFEST.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include README.rst
include LICENSE
15 changes: 10 additions & 5 deletions Pipfile
View file
Original file line number Diff line number Diff line change
@@ -3,15 +3,20 @@ url = "https://pypi.python.org/simple"
verify_ssl = true

[packages]
Django = "*"
django = "*"



[dev-packages]

ipython = "*"
ipdb = "*"
pytest = "*"
pytest-cov = "*"
pytest-django = "*"
flake8 = "*"
pytest-pythonpath = "*"
"pytest-cov" = "*"
"pytest-django" = "*"
"flake8" = "*"
"pytest-pythonpath" = "*"
twine = "*"
wheel = "*"
sphinx = "*"
"sphinx-rtd-theme" = "*"
Loading