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

overhangio · Aug 28, 2023 · 93ba8b5 · 93ba8b5
2 parents 4bb1316 + 1d8c33f
commit 93ba8b5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,12 @@ instructions, because git commits are used to generate release notes:
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-16.1.1'></a>
+## v16.1.1 (2023-08-28)
+
+- [Bugfix] Add `INFO_EMAIL` and `PASSWORD_RESET_SUPPORT_LINK` missing variables defaults of `CONTACT_EMAIL` and `mailto:{{ CONTACT_EMAIL }}` respectfully. These two variables help build the "Forgot Password" screen. (by @misilot)
+- [Bugfix] Corrected typo error in `PROFILE_MICROFRONTEND_URL` of development env settings. (by @kiran1415)
+
 <a id='changelog-16.1.0'></a>
 ## v16.1.0 (2023-08-03)
 

diff --git a/changelog.d/20230819_190050_kiran.767.767_settings_typo_fix.md b/changelog.d/20230819_190050_kiran.767.767_settings_typo_fix.md
diff --git a/tutormfe/__about__.py b/tutormfe/__about__.py
@@ -1,4 +1,4 @@
-__version__ = "16.1.0"
+__version__ = "16.1.1"
 __package_version__ = __version__
 
 

diff --git a/tutormfe/patches/openedx-lms-development-settings b/tutormfe/patches/openedx-lms-development-settings
@@ -6,6 +6,7 @@ MFE_CONFIG = {
     "CREDENTIALS_BASE_URL": "",
     "DISCOVERY_API_BASE_URL": "{% if DISCOVERY_HOST is defined %}http://{{ DISCOVERY_HOST }}:8381{% endif %}",
     "FAVICON_URL": "http://{{ LMS_HOST }}/favicon.ico",
+    "INFO_EMAIL": "{{ CONTACT_EMAIL }}",
     "LANGUAGE_PREFERENCE_COOKIE_NAME": "openedx-language-preference",
     "LMS_BASE_URL": "http://{{ LMS_HOST }}:8000",
     "LOGIN_URL": "http://{{ LMS_HOST }}:8000/login",
@@ -14,6 +15,7 @@ MFE_CONFIG = {
     "LOGO_TRADEMARK_URL": "http://{{ LMS_HOST }}:8000/theming/asset/images/logo.png",
     "LOGOUT_URL": "http://{{ LMS_HOST }}:8000/logout",
     "MARKETING_SITE_BASE_URL": "http://{{ LMS_HOST }}:8000",
+    "PASSWORD_RESET_SUPPORT_LINK": "mailto:{{ CONTACT_EMAIL }}",
     "REFRESH_ACCESS_TOKEN_ENDPOINT": "http://{{ LMS_HOST }}:8000/login_refresh",
     "SITE_NAME": "{{ PLATFORM_NAME }}",
     "STUDIO_BASE_URL": "http://{{ CMS_HOST }}:8001",

diff --git a/tutormfe/patches/openedx-lms-production-settings b/tutormfe/patches/openedx-lms-production-settings
@@ -6,6 +6,7 @@ MFE_CONFIG = {
     "CREDENTIALS_BASE_URL": "",
     "DISCOVERY_API_BASE_URL": "{% if DISCOVERY_HOST is defined %}{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ DISCOVERY_HOST }}{% endif %}",
     "FAVICON_URL": "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ LMS_HOST }}/favicon.ico",
+    "INFO_EMAIL": "{{ CONTACT_EMAIL }}",
     "LANGUAGE_PREFERENCE_COOKIE_NAME": "openedx-language-preference",
     "LMS_BASE_URL": "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ LMS_HOST }}",
     "LOGIN_URL": "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ LMS_HOST }}/login",
@@ -14,6 +15,7 @@ MFE_CONFIG = {
     "LOGO_TRADEMARK_URL": "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ LMS_HOST }}/theming/asset/images/logo.png",
     "LOGOUT_URL": "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ LMS_HOST }}/logout",
     "MARKETING_SITE_BASE_URL": "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ LMS_HOST }}",
+    "PASSWORD_RESET_SUPPORT_LINK": "mailto:{{ CONTACT_EMAIL }}",
     "REFRESH_ACCESS_TOKEN_ENDPOINT": "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ LMS_HOST }}/login_refresh",
     "SITE_NAME": "{{ PLATFORM_NAME }}",
     "STUDIO_BASE_URL": "{{ "https" if ENABLE_HTTPS else "http" }}://{{ CMS_HOST }}",