From eccb20cfde424f237ce3a684615c268e6ed85150 Mon Sep 17 00:00:00 2001 From: Alexander J Sheehan Date: Thu, 29 Jun 2023 16:27:36 +0000 Subject: [PATCH 01/30] chore: bumping enterprise package version to 3.67.7 --- requirements/constraints.txt | 2 +- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index c0badc730001..ee8a214c5ade 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -32,7 +32,7 @@ django-storages==1.9.1 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==3.67.6 +edx-enterprise==3.67.7 # oauthlib>3.0.1 causes test failures ( also remove the django-oauth-toolkit constraint when this is fixed ) oauthlib==3.0.1 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index ce5cf2b3923e..a0a2634e2cf2 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -489,7 +489,7 @@ edx-drf-extensions==8.8.0 # edx-when # edxval # learner-pathway-progress -edx-enterprise==3.67.6 +edx-enterprise==3.67.7 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index cfb3f460a115..8f1af5a5e599 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -617,7 +617,7 @@ edx-drf-extensions==8.8.0 # edx-when # edxval # learner-pathway-progress -edx-enterprise==3.67.6 +edx-enterprise==3.67.7 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 0ddfb8864232..714d0878c076 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -590,7 +590,7 @@ edx-drf-extensions==8.8.0 # edx-when # edxval # learner-pathway-progress -edx-enterprise==3.67.6 +edx-enterprise==3.67.7 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt From 00defba37311d5668098a0b82e3544ebbd6664fa Mon Sep 17 00:00:00 2001 From: Kristin Aoki <42981026+KristinAoki@users.noreply.github.com> Date: Thu, 29 Jun 2023 13:21:18 -0400 Subject: [PATCH 02/30] fix: missing and broken waffle flag links (#32587) --- cms/templates/widgets/header.html | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index 39efc419ffa6..57e40c35ff33 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -125,9 +125,16 @@

${_("Course" ${_("Pages & Resources")} % endif + %if not files_uploads_mfe_enabled: + %endif + %if files_uploads_mfe_enabled: + + %endif % if not pages_and_resources_mfe_enabled: