christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2025-01-05 23:20:40 +00:00
Code Issues Releases Activity

Merge branch 'master' into nightly

Browse Source
This commit is contained in:
Régis Behmo 2023-01-18 08:45:22 +01:00
commit 0f67506985
7 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/20230106_163518_regis_fix_example_com_links.md Normal file
View File

@ -0,0 +1 @@
- 💥[Bugfix] Fix "example.com" links in registration emails. This is a breaking change for platforms that have modified the "id" field of the LMS site object in the database. These platforms should set `SITE_ID=1` in the common settings via a plugin. (by @regisb)

1
changelog.d/20230109_134927_regis_fix_tinymce_formatting.md Normal file
View File

@ -0,0 +1 @@
- [Bugfix] Fix HTML component editing in studio by cherry-picking [upstream fix](https://github.com/openedx/edx-platform/pull/31500). (by @regisb)

1
changelog.d/20230117_165024_regis_cors_whitelist.md Normal file
View File

@ -0,0 +1 @@
- [Improvement] Resolve `CORS_ORIGIN_WHITELIST` warnings that pollute the LMS and CMS logs. As far as we know they were not causing any issue, apart from being a nuisance. (by @regisb)

1
tutor/templates/apps/openedx/settings/cms/production.py
View File

@ -8,6 +8,7 @@ ALLOWED_HOSTS = [
ENV_TOKENS.get("CMS_BASE"),
"cms",
]
CORS_ORIGIN_WHITELIST.append("{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ CMS_HOST }}")
# Authentication
SOCIAL_AUTH_EDX_OAUTH2_KEY = "{{ CMS_OAUTH2_KEY_SSO }}"

1
tutor/templates/apps/openedx/settings/lms/production.py
View File

@ -9,6 +9,7 @@ ALLOWED_HOSTS = [
FEATURES["PREVIEW_LMS_BASE"],
"lms",
]
CORS_ORIGIN_WHITELIST.append("{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ LMS_HOST }}")
{% if ENABLE_HTTPS %}
# Properly set the "secure" attribute on session/csrf cookies. This is required in

4
tutor/templates/apps/openedx/settings/partials/common_all.py
View File

@ -78,6 +78,10 @@ CACHES = {
},
}
# The default Django contrib site is the one associated to the LMS domain name. 1 is
# usually "example.com", so it's the next available integer.
SITE_ID = 2
# Contact addresses
CONTACT_MAILING_ADDRESS = "{{ PLATFORM_NAME }} - {% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ LMS_HOST }}"
DEFAULT_FROM_EMAIL = ENV_TOKENS.get("DEFAULT_FROM_EMAIL", ENV_TOKENS["CONTACT_EMAIL"])

4
tutor/templates/build/openedx/Dockerfile
View File

@ -42,8 +42,12 @@ WORKDIR /openedx/edx-platform
RUN git config --global user.email "tutor@overhang.io" \
&& git config --global user.name "Tutor"
{%- if patch("openedx-dockerfile-git-patches-default") %}
# Custom edx-platform patches
{{ patch("openedx-dockerfile-git-patches-default") }}
{%- else %}
# Patch edx-platform
{%- endif %}
{# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1> | git am #}
{{ patch("openedx-dockerfile-post-git-checkout") }}