From ddcfab2ddb5111f98b97f3dd1832e8c314482a87 Mon Sep 17 00:00:00 2001 From: Crist Ye Date: Wed, 8 Dec 2021 17:28:55 +0800 Subject: [PATCH 1/3] docs: improve `plugin defaults` readability --- docs/plugins/api.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/plugins/api.rst b/docs/plugins/api.rst index cc85a9d..903eb51 100644 --- a/docs/plugins/api.rst +++ b/docs/plugins/api.rst @@ -11,7 +11,7 @@ config The ``config`` attribute is used to modify existing and add new configuration parameters: * ``config["add"]`` are key/values that should be added to the user-specific ``config.yml`` configuration. Add there passwords, secret keys and other values that do not have a default value. -* ``config["defaults"]`` are default key/values for this plugin. These values will not be added to the ``config.yml`` user file unless users override them manually with ``tutor config save --set ...``. +* ``config["defaults"]`` are default key/values for this plugin. These values can be accessed even though they are not added to the ``config.yml`` user file. Users can override them manually with ``tutor config save --set ...``. * ``config["set"]`` are existing key/values that should be modified. Be very careful what you add there! Different plugins may define conflicting values for some parameters. "add" and "defaults" key names will be automatically prefixed with the plugin name, in upper case. From 79c6d122e26f4fb5e4b69474f54abde2d321ccb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Wed, 8 Dec 2021 11:28:51 +0100 Subject: [PATCH 2/3] fix: incorrect "from" address in course bulk emails Upstream PR: https://github.com/edx/edx-platform/pull/29001 See discussion: https://discuss.overhang.io/t/sending-bulk-email-triggers-smtprecipientsrefused-error/1923 Related issue: https://github.com/openedx/build-test-release-wg/issues/102 --- CHANGELOG.md | 1 + tutor/templates/build/openedx/Dockerfile | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7885492..5f4bb7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥". ## Unreleased +- [Bugfix] Fix incorrect "from" address in course bulk emails (see [pull request](https://github.com/edx/edx-platform/pull/29001)). - 💥[Improvement] Fail on incorrect image name argument in `images build/pull/push/printtag` commands. - [Bugfix] Remove trailing slashes in docker-compose files for [compatibility with docker-compose v2 in WSL](https://github.com/docker/compose/issues/8558). - [Improvement] `settheme` now works with preview domain. diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 9da4463..0a60e83 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -47,6 +47,13 @@ RUN git config --global user.email "tutor@overhang.io" \ # edx-proctoring security fix https://github.com/edx/edx-platform/pull/29347/ RUN git fetch --depth=2 https://github.com/edx/edx-platform d61dcac29d1651956623c150be53a8bbe69e9346 \ && git cherry-pick d61dcac29d1651956623c150be53a8bbe69e9346 +# Fix "from" address in course bulk emails +# https://github.com/edx/edx-platform/pull/29001 +RUN git fetch --depth=4 https://github.com/bitmakerla/edx-platform 6b0e9f50e9425d17cd62d1b3e9d1cab220e3fe7f \ + && git cherry-pick 01216d9e0637a2260b4c264bda2f22c1e34b38de \ + && git cherry-pick a057853a85560759d1d922b00db110207252c6a2 \ + && git cherry-pick 6b0e9f50e9425d17cd62d1b3e9d1cab220e3fe7f + {% endif %} {# Example: RUN git fetch --depth=2 https://github.com/edx/edx-platform && git cherry-pick #} From e89ff49223ef4624058ab77ccb72c1394abb8be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Wed, 8 Dec 2021 11:06:48 +0100 Subject: [PATCH 3/3] v12.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 💥[Improvement] Fail on incorrect image name argument in `images build/pull/push/printtag` commands. - [Bugfix] Remove trailing slashes in docker-compose files for [compatibility with docker-compose v2 in WSL](https://github.com/docker/compose/issues/8558). - [Improvement] `settheme` now works with preview domain. - [Feature] Allow specifying extra pip packages through config.yml. --- CHANGELOG.md | 2 +- tutor/__about__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f4bb7a..5903e0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ Note: Breaking changes between versions are indicated by "💥". -## Unreleased +## v12.2.0 (2021-12-08) - [Bugfix] Fix incorrect "from" address in course bulk emails (see [pull request](https://github.com/edx/edx-platform/pull/29001)). - 💥[Improvement] Fail on incorrect image name argument in `images build/pull/push/printtag` commands. diff --git a/tutor/__about__.py b/tutor/__about__.py index cf1fe44..ecd4733 100644 --- a/tutor/__about__.py +++ b/tutor/__about__.py @@ -2,7 +2,7 @@ import os # Increment this version number to trigger a new release. See # docs/tutor.html#versioning for information on the versioning scheme. -__version__ = "12.1.7" +__version__ = "12.2.0" # The version suffix will be appended to the actual version, separated by a # dash. Use this suffix to differentiate between the actual released version and