From 53838af21ac32c1e693d3904968b6d75d9cb5bd5 Mon Sep 17 00:00:00 2001 From: Ricky Date: Wed, 17 Mar 2021 12:02:38 -0700 Subject: [PATCH 1/3] Django 3.0 updates --- .../templates/admin/happymailer/templatemodel/change_form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/happymailer/templates/admin/happymailer/templatemodel/change_form.html b/happymailer/templates/admin/happymailer/templatemodel/change_form.html index fb1e15e..352aeff 100644 --- a/happymailer/templates/admin/happymailer/templatemodel/change_form.html +++ b/happymailer/templates/admin/happymailer/templatemodel/change_form.html @@ -1,5 +1,5 @@ {% extends "admin/change_form.html" %} -{% load i18n admin_urls admin_static admin_modify %} +{% load i18n admin_urls static admin_modify %} {% block content %}
From 1e3b2337b299c3a03c9dfb8dd6fe5a168a79b7a6 Mon Sep 17 00:00:00 2001 From: Ricky Date: Wed, 17 Mar 2021 12:03:27 -0700 Subject: [PATCH 2/3] Django 3.0 updates --- .../templates/admin/happymailer/templatemodel/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/happymailer/templates/admin/happymailer/templatemodel/base.html b/happymailer/templates/admin/happymailer/templatemodel/base.html index 99328e0..beadf4c 100644 --- a/happymailer/templates/admin/happymailer/templatemodel/base.html +++ b/happymailer/templates/admin/happymailer/templatemodel/base.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_static admin_modify %} +{% load i18n static admin_modify %} {% load admin_urls %} {% block extrastyle %}{{ block.super }}{% endblock %} @@ -13,4 +13,4 @@ › {% block breadcrumbs_last %}{% endblock %}
{% endblock %} -{% endif %} \ No newline at end of file +{% endif %} From badcd4a8fce2a6c8500b3db59e7868db014c2050 Mon Sep 17 00:00:00 2001 From: Ricky Date: Wed, 17 Mar 2021 12:56:31 -0700 Subject: [PATCH 3/3] Bump version and requirements --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 93fff3a..e75fd75 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='django-happymailer', - version='0.2.1', + version='0.3.1', description='django email templates manager', author='Victor Kotcheruba', author_email='barbuzaster@gmail.com', @@ -11,7 +11,7 @@ include_package_data=True, packages=find_packages(exclude=['django_happymailer','dummy','dummy2']), install_requires=[ - 'django >= 2.0', + 'django >= 3.0', 'django-import-export >= 0.4.5', 'faker >= 0.8.6', 'html2text >= 2016.5.29',