Merge branch '1.5.0'

wuyue92tree · Jan 21, 2020 · 10793b7 · 10793b7
2 parents 6701060 + 392f55d
commit 10793b7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/adminlteui/__init__.py b/adminlteui/__init__.py
@@ -1,2 +1,2 @@
-version = '1.5.0b0'
+version = '1.5.0'
 default_app_config = 'adminlteui.apps.AdminlteUIConfig'
diff --git a/adminlteui/templates/admin/base.html b/adminlteui/templates/admin/base.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static adminlte_options adminlte_menu %}<!DOCTYPE html>
+{% load i18n static adminlte_options adminlte_menu %}<!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
 
 {% get_adminlte_settings as adminlte %}

diff --git a/adminlteui/templates/admin/login.html b/adminlteui/templates/admin/login.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static adminlte_options %}<!DOCTYPE html>
+{% load i18n static adminlte_options %}<!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
 <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 <head>

diff --git a/adminlteui/templates/adminlte/general_option.html b/adminlteui/templates/adminlte/general_option.html
@@ -1,5 +1,5 @@
 {% extends 'admin/base_site.html' %}
-{% load i18n admin_static adminlte_options %}
+{% load i18n static adminlte_options %}
 
 {% block extrastyle %}
 {{ block.super }}

diff --git a/adminlteui/templates/registration/logged_out.html b/adminlteui/templates/registration/logged_out.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static adminlte_options %}<!DOCTYPE html>
+{% load i18n static adminlte_options %}<!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
 <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 <head>

diff --git a/docs/about.md b/docs/about.md
@@ -1,7 +1,8 @@
 # ChangeLog
 
-## [v1.5.0b0](https://github.com/wuyue92tree/django-adminlte-ui/releases/tag/1.5.0b0)
+## [v1.5.0](https://github.com/wuyue92tree/django-adminlte-ui/releases/tag/1.5.0)
 
+- fix #12 admin_static is removed in django3
 - add adminlte/widgets/select.html && auto active select2 by select id.
 
 ## [v1.4.0](https://github.com/wuyue92tree/django-adminlte-ui/releases/tag/1.4.0)