Merge branch 'release/7.4.1'

uccser · Apr 19, 2024 · 414eff7 · 414eff7
2 parents 2f98f57 + 4c0afde
commit 414eff7
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 6 deletions.
diff --git a/csunplugged/config/__init__.py b/csunplugged/config/__init__.py
@@ -1,3 +1,3 @@
 """Module for Django system configuration."""
 
-__version__ = "7.4.0"
+__version__ = "7.4.1"
diff --git a/csunplugged/config/settings/base.py b/csunplugged/config/settings/base.py
@@ -328,10 +328,5 @@
     "https://canterbury.ac.nz"
 ]
 
-CSRF_TRUSTED_ORIGINS = [
-    "https://*.localhost",
-    "https://*.canterbury.ac.nz"
-]
-
 # Used by speaker notes for at a distance slides
 X_FRAME_OPTIONS = "SAMEORIGIN"
diff --git a/csunplugged/config/settings/local.py b/csunplugged/config/settings/local.py
@@ -99,3 +99,12 @@ def show_django_debug_toolbar(request):
 # Suppress these loggers in local development for less noise in logs
 logging.getLogger('gunicorn.access').handlers = []  # noqa F405
 logging.getLogger('gunicorn.error').handlers = []  # noqa F405
+
+
+# CSRF
+# ------------------------------------------------------------------------------
+CSRF_TRUSTED_ORIGINS = [
+    "https://www.csunplugged.org",
+    "https://cs-unplugged-dev.csse.canterbury.ac.nz",
+    "https://cs-unplugged.localhost",
+]
diff --git a/csunplugged/config/settings/production.py b/csunplugged/config/settings/production.py
@@ -71,3 +71,9 @@
 # SECURE_SSL_REDIRECT = env.bool("DJANGO_SECURE_SSL_REDIRECT", default=True)  # noqa: F405
 # CSRF_COOKIE_SECURE = True
 # CSRF_COOKIE_HTTPONLY = True
+
+# CSRF
+# ------------------------------------------------------------------------------
+CSRF_TRUSTED_ORIGINS = [
+    "https://www.csunplugged.org",
+]
diff --git a/csunplugged/config/settings/testing.py b/csunplugged/config/settings/testing.py
@@ -80,3 +80,11 @@
     ("de", "German"),
     ("fr", "French"),
 )
+
+# CSRF
+# ------------------------------------------------------------------------------
+CSRF_TRUSTED_ORIGINS = [
+    "https://www.csunplugged.org",
+    "https://cs-unplugged-dev.csse.canterbury.ac.nz",
+    "https://cs-unplugged.localhost",
+]
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -23,6 +23,15 @@ All notable changes to this project will be documented in this file.
   fit the Semantic Versioning model. However these version numbers can still
   provide a good indication of the changes in each version.
 
+7.2.1
+==============================================================================
+
+**Release date:** 19 April 2024
+
+**Changelog:**
+
+- Fix jobe access issue breaking Plugging it in test code button.
+
 7.4.0
 ==============================================================================