diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 90b38c544..03b6da9ab 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -24,6 +24,7 @@ Changelog * New translations for Hungarian, Swedish (Sweden) and Turkish * Upgraded jQuery to 2.2.1 (Charlie Choiniere) * Multiple homepage summary items (`construct_homepage_summary_items` hook) now better vertically spaced (Nicolas Kuttler) + * Email notifications can be sent in HTML format now (Mike Dingjan) * Fix: Custom page managers no longer raise an error when used on an abstract model * Fix: Wagtail's migrations are now all reversible (benjaoming) * Fix: Deleting a page content type now preserves existing pages as basic Page instances, to prevent tree corruption diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index da2463742..38256e087 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -111,6 +111,7 @@ Contributors * Gareth Price * Liam Brenner * Nicolas Kuttler +* Mike Dingjan Translators =========== diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst index e30700496..a3d411c1b 100644 --- a/docs/advanced_topics/settings.rst +++ b/docs/advanced_topics/settings.rst @@ -232,9 +232,10 @@ Email Notifications Wagtail sends email notifications when content is submitted for moderation, and when the content is accepted or rejected. This setting lets you pick which email address these automatic notifications will come from. If omitted, Django will fall back to using the ``DEFAULT_FROM_EMAIL`` variable if set, and ``webmaster@localhost`` if not. +.. _email_notifications_format: -Email Notification format -------------------------- +Email Notifications format +-------------------------- .. code-block:: python diff --git a/docs/releases/1.4.rst b/docs/releases/1.4.rst index 9804677d3..5e5ae37ec 100644 --- a/docs/releases/1.4.rst +++ b/docs/releases/1.4.rst @@ -63,6 +63,7 @@ Minor features * The `edit bird` on the frontend has been redesigned, and no longer depends on an iframe (Thomas Winter, Gareth Price). * Upgraded jQuery to 2.2.1 (Charlie Choiniere) * Multiple homepage summary items (`construct_homepage_summary_items` hook) now better vertically spaced (Nicolas Kuttler) + * Email notifications can be sent in HTML format now. See :ref:`email_notifications_format` (Mike Dingjan) Bug fixes