Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BB-9488] feat: prepare sumac branch #744

Open
wants to merge 18 commits into
base: opencraft-release/sumac.1
Choose a base branch
from
Open

[BB-9488] feat: prepare sumac branch #744

wants to merge 18 commits into from

Conversation

Cup0fCoffee
Copy link
Member

This PR ports all code drift from opencraft-release/redwood.1 to opencraft-release/sumac.1. You can see all commits that are present in opencraft-release/redwood.1 and are missing in open-release/redwood.master here or locally via git 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.

kaustavb12 and others added 16 commits March 2, 2025 00:41
@kaustavb12 @Cup0fCoffee
feat: allow switching anonymous user ID hashing algorithm from shake …
fb693bf 
…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)
@xitij2000 @Cup0fCoffee
temp: Add configuration option to redirect to external site when TAP …
22b4445 
…account is unlinked

(cherry picked from commit e83a8c8f82849644cf95534cde3fe149e4f11916)
(cherry picked from commit 0c831dc)
(cherry picked from commit c596bf3)
(cherry picked from commit 64f5dea)
@0x29a @Cup0fCoffee
feat: all eSHE role features squashed in one commit
bfa2081 
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)
@viadanna @Cup0fCoffee
feat: DEFAULT_COURSE_INVITATION_ONLY allow for invitation_only new co…
5fb5130 
…urses by default

(cherry picked from commit ffe3ff4)
(cherry picked from commit bb9c2bc)
@Cup0fCoffee
feat: add a feature flag to disable dates tab for all courses
9e735ad 
(cherry picked from commit 88bb2a4)
@CefBoud @Cup0fCoffee
feat: tpa automatic logout with a single redirect
ad27ea7 
(cherry picked from commit e8c942c)
(cherry picked from commit 622d891)
@Kelketek @Cup0fCoffee
feat: Allow trusted apps to perform cookie login.
11688bd 
(cherry picked from commit 7fcd198)
@tecoholic @Cup0fCoffee
fix: prevent redirects to /undefined after saml auth
f7bcad0 
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)
@kaustavb12 @Cup0fCoffee
feat: in-context discussion for units can be disabled by default (#676)
c4d4814 
(cherry picked from commit 10aec43)
@viadanna @Cup0fCoffee
fix: unhide discussion tab when enabling it (#677)
ecaa84f 
(cherry picked from commit 11ddc19)
@viadanna @Cup0fCoffee
fix: unhide discussion tab when enabling it (#677)
36d5889 
(cherry picked from commit 80e27f6)
@0x29a @Cup0fCoffee
feat: add has_course_author_access to CourseHomeMetadataView response (…
7fcc1ad 
…#682)

Cherry-picked from openedx#35313

(cherry picked from commit 50470c1)
@0x29a @Cup0fCoffee
feat: allow Bearer auth for sequence metadata
5c74009 
(cherry picked from commit 3ba4ab1)
@xitij2000 @Cup0fCoffee
feat: User agreements API for generic agreement records
b2d3651 
This change adds a new kind of generic user agreement that allows plugins or
even the core platform to record a user's acknowledgement of an agreement.

(cherry picked from commit dc0383f)
(cherry picked from commit 2481c0e)
@0x29a @Cup0fCoffee
fix: use a single 'provider_type' key for storing discussion provider…
735a77c 
… 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)
@Agrendalath @Cup0fCoffee
fix: remove incorrect key type when filtering inaccessible blocks
ea05de5 
Returning the list with a 'completion' string was added in 9bc0f85. However,
the `get_accessible_sequences` method expects a list of dicts with an 'id' key.

(cherry picked from commit be897f0)
@Cup0fCoffee Cup0fCoffee requested a review from 0x29a March 2, 2025 23:03
0x29a
0x29a approved these changes Mar 3, 2025
View reviewed changes
Copy link
Member

@0x29a 0x29a left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

  • I didn't test this. Only checked that the instance is working (registration, enrollments, etc). The reason is in the ticket comments.
  • I read through the list of commits in the spreadsheet and compared it to the actual diff.

@viadanna @Cup0fCoffee
chore: bump ora2 fork
1d2384f 
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 Cup0fCoffee force-pushed the maxim/bb-9488-prepare-sumac-branch branch 2 times, most recently from bcad9fd to 130de74 Compare March 7, 2025 21:16
@feanil @Cup0fCoffee
Merge pull request openedx#35713 from openedx/feanil/ubuntu-24.04
793b7b1 
feanil/ubuntu 24.04

(cherry picked from commit 642dae6)
@Cup0fCoffee Cup0fCoffee force-pushed the maxim/bb-9488-prepare-sumac-branch branch from 130de74 to 793b7b1 Compare March 7, 2025 22:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0x29a 0x29a 0x29a approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@Cup0fCoffee @0x29a @kaustavb12 @xitij2000 @viadanna @CefBoud @Kelketek @tecoholic @Agrendalath @feanil