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.

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

fix: update from palm.master #812

Merged
merged 3 commits into from
Mar 19, 2024

Conversation

luisfelipec95
Copy link

@luisfelipec95 luisfelipec95 commented Mar 19, 2024

Description

This is a cherry pick that comes from https://github.com/openedx/edx-platform with the purpose of updating palma.master:

@luisfelipec95 luisfelipec95 requested a review from a team March 19, 2024 00:25
Agrendalath and others added 2 commits March 19, 2024 10:16
…-jwt-restricted-application-check-palm

fix(palm): add `JwtRestrictedApplication` check to XBlock callback
…4171)

* fix: add missing function import in certificate template
* test: add test case to check certificates generated when GA4 is enabled

(cherry picked from commit d0a49d1)
@luisfelipec95 luisfelipec95 force-pushed the lfc/cherry_pick_community branch from f246d66 to 86fe5be Compare March 19, 2024 15:17
@luisfelipec95 luisfelipec95 changed the title cherry picks from openedx/edx-platform fix: update to palm.master Mar 19, 2024
@luisfelipec95 luisfelipec95 changed the title fix: update to palm.master fix: update from palm.master Mar 19, 2024
Copy link
Contributor

@MaferMazu MaferMazu left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks.

@luisfelipec95 luisfelipec95 merged commit 3b00c8c into ednx-release/palma.master Mar 19, 2024
36 checks passed
bra-i-am pushed a commit that referenced this pull request Apr 16, 2024
* fix: Update the date to the max year possible in a test. (#33995)

This test broke on January 1, 2024.

* Merge pull request #34048 from open-craft/agrendalath/xblock-callback-jwt-restricted-application-check-palm

fix(palm): add `JwtRestrictedApplication` check to XBlock callback

* fix: add missing function import in certificate template (#33904) (#34171)

* fix: add missing function import in certificate template
* test: add test case to check certificates generated when GA4 is enabled

(cherry picked from commit d0a49d1)

---------

Co-authored-by: Diana Huang <dkh@edx.org>
Co-authored-by: Piotr Surowiec <piotr@surowiec.it>
Co-authored-by: Kaustav Banerjee <kaustav@opencraft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants