Merge branch 'main' into images-django-imagekit

2021-08-02 13:43:59 -06:00
parent 0c83882a11 acab222f8f
commit af34dc6520
58 changed files with 4202 additions and 1234 deletions
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -1,6 +1,7 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load humanize %}
+{% load static %}

 {% block title %}{% trans "Import Status" %}{% endblock %}

@@ -156,5 +157,5 @@
 {% endspaceless %}{% endblock %}

 {% block scripts %}
-<script src="/static/js/check_all.js"></script>
+<script src="{% static "js/check_all.js" %}"></script>
 {% endblock %}