Merge branch 'master' into update-to-django-1-8

CHANGELOG.md

@@ -1,5 +1,6 @@
-## v11.1.0 (upcoming)
+## Unreleased
 
+* Add correct HTML to HTML email templates.
 * Add `django v1.8` support.
 
 ## v11.0.0

user_management/api/templates/user_management/account_validation_email.html

@@ -1,12 +1,18 @@
-{% spaceless %}{% load i18n %}{% autoescape off %}{% blocktrans with name=site.name %}
+{% load i18n %}
+<p>
+{% blocktrans with name=site.name %}
 You are receiving this email because your email address has been used to
 register an account at {{ name }}.
-
+{% endblocktrans %}
+</p>
+<p>
+{% blocktrans %}
 Please click the following link to complete your registration:
 {% endblocktrans %}
-{{ protocol }}://{{ site.domain }}/#/register/verify/{{ token }}/
-
+</p>
+<p><a href="{{ protocol }}://{{ site.domain }}/#/register/verify/{{ token }}/">{{ protocol }}://{{ site.domain }}/#/register/verify/{{ token }}/</a></p>
+<p>
 {% blocktrans with name=site.name %}
 The {{ name }} team.
-{% endblocktrans %}{% endautoescape %}
-{% endspaceless %}
+{% endblocktrans %}
+</p>

user_management/api/templates/user_management/account_validation_email.txt

@@ -1,12 +1,13 @@
-{% spaceless %}{% load i18n %}{% autoescape off %}{% blocktrans with name=site.name %}
+{% load i18n %}{% blocktrans with name=site.name %}
 You are receiving this email because your email address has been used to
 register an account at {{ name }}.
-
+{% endblocktrans %}
+{% blocktrans %}
 Please click the following link to complete your registration:
 {% endblocktrans %}
+
 {{ protocol }}://{{ site.domain }}/#/register/verify/{{ token }}/
 
 {% blocktrans with name=site.name %}
 The {{ name }} team.
-{% endblocktrans %}{% endautoescape %}
-{% endspaceless %}
+{% endblocktrans %}

user_management/api/templates/user_management/password_reset_email.html

@@ -1,10 +1,18 @@
-{% spaceless %}{% load i18n %}{% autoescape off %}{% blocktrans with name=site.name %}
+{% load i18n %}
+<p>
+{% blocktrans with name=site.name %}
 You are receiving this email because you requested a password reset
 for your user account at {{ name }}.
-
-Please go to the following page and choose a new password:{% endblocktrans %}
-{{ protocol }}://{{ site.domain }}{% url 'user_management_api:password_reset_confirm' uidb64=uid token=token %}
+{% endblocktrans %}
+</p>
+<p>
+{% blocktrans %}
+Please go to the following page and choose a new password:
+{% endblocktrans %}
+</p>
+<p><a href="{{ protocol }}://{{ site.domain }}{% url 'user_management_api:password_reset_confirm' uidb64=uid token=token %}">{{ protocol }}://{{ site.domain }}{% url 'user_management_api:password_reset_confirm' uidb64=uid token=token %}</a></p>
+<p>
 {% blocktrans with name=site.name %}
 The {{ name }} team.
-{% endblocktrans %}{% endautoescape %}
-{% endspaceless %}
+{% endblocktrans %}
+</p>

user_management/api/templates/user_management/password_reset_email.txt

@@ -1,10 +1,15 @@
-{% spaceless %}{% load i18n %}{% autoescape off %}{% blocktrans with name=site.name %}
+{% load i18n %}
+{% blocktrans with name=site.name %}
 You are receiving this email because you requested a password reset
 for your user account at {{ name }}.
+{% endblocktrans %}
+
+{% blocktrans %}
+Please go to the following page and choose a new password:
+{% endblocktrans %}
 
-Please go to the following page and choose a new password:{% endblocktrans %}
 {{ protocol }}://{{ site.domain }}{% url 'user_management_api:password_reset_confirm' uidb64=uid token=token %}
+
 {% blocktrans with name=site.name %}
 The {{ name }} team.
-{% endblocktrans %}{% endautoescape %}
-{% endspaceless %}
+{% endblocktrans %}