Merge remote-tracking branch 'origin/master' into nightly

overhangio · Dec 9, 2023 · 073fe08 · 073fe08
2 parents 7dc8b26 + 18cce70
commit 073fe08
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,13 @@ instructions, because git commits are used to generate release notes:
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-16.0.2'></a>
+## v16.0.2 (2023-12-09)
+
+- [Improvement] Added Typing to code, Makefile and test action to the repository and formatted code with Black and isort. (by @CodeWithEmad)
+- [Improvement] Introduced Course Discovery Repository and Version settings. (by @Faraz32123)
+- [BugFix] Fix base url for discovery media files, including program banner images. (by @Faraz32123)
+
 <a id='changelog-16.0.1'></a>
 ## v16.0.1 (2023-11-08)
 

diff --git a/changelog.d/20231005_153602_codewithemad.md b/changelog.d/20231005_153602_codewithemad.md
diff --git a/...20231113_125255_faraz.maqsood_introduce_course_discovery_repository_settings.md b/...20231113_125255_faraz.maqsood_introduce_course_discovery_repository_settings.md
diff --git a/tutordiscovery/__about__.py b/tutordiscovery/__about__.py
@@ -1 +1 @@
-__version__ = "16.0.1"
+__version__ = "16.0.2"
diff --git a/tutordiscovery/templates/discovery/apps/settings/tutor/development.py b/tutordiscovery/templates/discovery/apps/settings/tutor/development.py
@@ -16,4 +16,7 @@
 # Disable API caching, which makes it a pain to troubleshoot issues
 USE_API_CACHING = False
 
+DISCOVERY_BASE_URL = "http://{{ DISCOVERY_HOST }}:8381"
+MEDIA_URL = DISCOVERY_BASE_URL + "/media/"
+
 {{ patch("discovery-development-settings") }}
diff --git a/tutordiscovery/templates/discovery/apps/settings/tutor/production.py b/tutordiscovery/templates/discovery/apps/settings/tutor/production.py
@@ -15,4 +15,7 @@
 
 SOCIAL_AUTH_REDIRECT_IS_HTTPS = {% if ENABLE_HTTPS %}True{% else %}False{% endif %}
 
+DISCOVERY_BASE_URL = "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ DISCOVERY_HOST }}"
+MEDIA_URL = DISCOVERY_BASE_URL + "/media/"
+
 {{ patch("discovery-production-settings") }}