Merge branch 'main' into develop

djangonaut-space · Jan 10, 2024 · a8f9a29 · a8f9a29
2 parents 8acaf86 + efb3cce
commit a8f9a29
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,7 @@
 
 
 <!-- PROJECT SHIELDS -->
+[![Run tests](https://github.com/djangonaut-space/wagtail-indymeet/actions/workflows/tests.yml/badge.svg)](https://github.com/djangonaut-space/wagtail-indymeet/actions/workflows/tests.yml)
 <!-- [![Contributors][contributors-shield]][contributors-url]
 [![Forks][forks-shield]][forks-url]
 [![Stargazers][stars-shield]][stars-url]

diff --git a/indymeet/settings/storages.py b/indymeet/settings/storages.py
@@ -7,6 +7,7 @@
 class AzureMediaStorage(AzureStorage):
     account_name = settings.AZURE_ACCOUNT_NAME
     account_key = settings.AZURE_ACCOUNT_KEY
+    account_key = settings.AZURE_STORAGE_KEY
     azure_container = settings.AZURE_MEDIA_CONTAINER
     expiration_secs = None
     overwrite_files = True

diff --git a/indymeet/templates/base.html b/indymeet/templates/base.html
@@ -79,6 +79,7 @@
         <!--[if lte IE 8]><link rel="stylesheet" href="assets/css/ie8.css" /><![endif]-->
         <link href='//fonts.googleapis.com/css?family=Roboto:400,300,300italic,100italic,100,400italic,500,500italic,700,900,700italic,900italic' rel='stylesheet' type='text/css'>
         <script defer data-domain="djangonaut.space" src="https://plausible.io/js/script.js"></script>
+        <script src="https://cdn.tailwindcss.com"></script>
     </head>
 
     <body class="{% block body_class %}{% endblock %}">

diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt
@@ -1,3 +1,4 @@
 -r requirements.txt
 pre-commit
 django-tailwind[reload]
+django-debug-toolbar