feat: prepare teak branch #793
Merged
Conversation
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
…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) (cherry picked from commit 5641d8e)
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 45f6593)
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 21787b7)
Cup0fCoffee
changed the title
Cup0fCoffee
force-pushed
the
maxim/bb-10049-port-code-drift
branch
from
06ed5f2 to
22dda08
Compare
samuelallan72
approved these changes
Oct 13, 2025
Member
samuelallan72
left a comment
samuelallan72
left a comment
There was a problem hiding this comment.
👍
- I tested this: reviewed the process for picking the commits, spot checked some cases.
- I read through the code
- I checked for accessibility issues
- Includes documentation
- [N/A] Added to the Code Drift project board (for backports)
… type in course 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 9ee4afa)
* feat: add ability to override middlewares for recurring nudges * feat: add ability to run command for all sites (cherry picked from commit 759e8f0)
(cherry picked from commit e9b6154)
This PR fixes the user not being created when accessing the discussion xblock as the course_key was missing in some of the api calls and that lead to the forum backend not being fetched correctly. (cherry picked from commit 7e80061)
Cup0fCoffee
force-pushed
the
maxim/bb-10049-port-code-drift
branch
from
22dda08 to
d2248ef
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This PR ports all of the code drift from
opencraft-release/sumac.1toopencraft/teak. The commits have been determined by comparingopen-release/sumac.masterandopencraft-release/sumac.1, and checking the code drift board.Supporting information
Comparison of
open-release/sumac.masterandopencraft-release/sumac.1.Code Drift board.
Auxiliary spreadsheet.
Testing instructions
Setup
>=20.0.0,<21.0.0.edx-platformand checkoutmaxim/bb-10049-port-code-driftbranch.Test commits
Follow the testing instructions from the following PRs to test that all changes are still working after porting the code drift:
Deadline
None
Other information
N/A
Private-ref: https://tasks.opencraft.com/browse/BB-10049