[BB-9488] feat: prepare sumac branch#744
Merged
Cup0fCoffee merged 18 commits intoopencraft-release/sumac.1from Mar 10, 2025
Merged
[BB-9488] feat: prepare sumac branch#744Cup0fCoffee merged 18 commits intoopencraft-release/sumac.1from
Cup0fCoffee merged 18 commits intoopencraft-release/sumac.1from
Conversation
…to md5 The hashing algorithm has been changed in cd60646. However, there are Open edX operators who maintain backward compatibility of anonymous user IDs after past rotations of their Django secret key. For them, altering the hashing algorithm was a breaking change that made their analytics inconsistent. (cherry picked from commit 746e4fe) (cherry picked from commit ff6d92f) (cherry picked from commit 7245bdc) (cherry picked from commit 6da7f58) (cherry picked from commit ee3aa4a)
fix: give superusers all studio permissions (cherry picked from commit 8ef55754f4a529cc6b784298320fcdb8b415bd83) (cherry picked from commit 8e281a9) (cherry picked from commit f552973) (cherry picked from commit 6de7b64) feat: eSHE Instructor role Adds the eSHE Instructor role, which inherits Course Staff permissions, but isn't able to enroll / un-enroll students and can't assing course team roles unless in combination with Course Staff / Instructor / Discussion admin roles. (cherry picked from commit 5d160c2) (cherry picked from commit a21b4f0) feat: Teaching Assistant role (cherry picked from commit 176de06) (cherry picked from commit 7ef00c0) (cherry picked from commit a0d8806)
(cherry picked from commit 88bb2a4)
(cherry picked from commit 7fcd198)
When a user authenticates using SAML, but their accounts aren't linked, they land on the login page with the message to link their accounts. If the `OC_REDIRECT_ON_TPA_UNLINKED_ACCOUNT` value is not set, they are redirected to `/undefined`. This commit checks that the `redirectURL` is a valid non-empty string before performing the redirect. The bug was introduced in 91f8d36, so this can be safely dropped once that temporary commit is removed from our branches. For Redwood, the relevant commit hash is 64f5dea. Internal-ref: https://tasks.opencraft.com/browse/BB-9010 (cherry picked from commit 9ade4ea) (cherry picked from commit b801f99)
(cherry picked from commit 10aec43)
(cherry picked from commit 11ddc19)
(cherry picked from commit 80e27f6)
…#682) Cherry-picked from openedx#35313 (cherry picked from commit 50470c1)
(cherry picked from commit 3ba4ab1)
… type in course (#722) Both 'provider' and 'provider_type' have been used for storing the discussion provider type in course 'discussions_settings' field, there are some places in the code checking for 'provider' and others checking for 'provider_type', in some cases this can cause a bug where it doesn't detect the correct provider which causes discussion settings not being copied correctly when a course is cloned. This change prioritises the `provider_type` setting over `provider` and reads `provider` only as a fallback. The `provider` setting is now made read-only just for backwards-compatibility, to avoid confusion. (cherry picked from commit cbddd4e) Co-authored-by: kshitij.sobti <kshitij@sobti.in> (cherry picked from commit 8612f2a)
0x29a
approved these changes
Mar 3, 2025
Setting ora2 dependency to our fork while awaiting upstream PR being merged[1]. Once it's merged, upstream will bump up the dependency version which will include this change, so will be able to drop this commit. 1: openedx/edx-ora2#2237 (cherry picked from commit 506201e)
Cup0fCoffee
force-pushed
the
maxim/bb-9488-prepare-sumac-branch
branch
2 times, most recently
from
bcad9fd to
130de74
Compare
feanil/ubuntu 24.04 (cherry picked from commit 642dae6)
Cup0fCoffee
force-pushed
the
maxim/bb-9488-prepare-sumac-branch
branch
from
130de74 to
793b7b1
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR ports all code drift from
opencraft-release/redwood.1toopencraft-release/sumac.1. You can see all commits that are present inopencraft-release/redwood.1and are missing inopen-release/redwood.masterhere or locally viagit log <opencraft remote>/opencraft-release/redwood.1 ^<openedx remote>/open-release/redwood.master.Here you can find a table with the list of all commits and useful information that was used to determine which commits should've been cherry picked.
For reference, here is the code drift board.