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

OpenCraft Palm.1 Release Branch #543

Merged
merged 19 commits into from Jun 27, 2023

Conversation

xitij2000
Copy link
Member

@xitij2000 xitij2000 commented Jun 22, 2023

This PR cherry-picks all the changes that have been applied to OpenCraft's nutmeg.2 branch that haven't been merged in the upstream palm.1 release branch.

It contains code from the following PRs:

@xitij2000 xitij2000 force-pushed the kshitij/palm-release branch 2 times, most recently from 79cfccf to 9bea2af Compare June 23, 2023 06:27
mtyaka and others added 6 commits June 23, 2023 13:24
(cherry picked from commit d393d6e AND
fixed linting issues)
(cherry picked from commit 216a206)
(cherry picked from commit ed4c7cc)
(cherry picked from commit 1c228db)
(cherry picked from commit c812a6c1d5c0961900507a6e7abe3d0f3b8a7570)
(cherry picked from commit 004f2fe)
The commit for "feat: Allow delete course content in Studio only for admin users"
introduces an incorrect import of an lms package from cms. Fixing this requires
a larger refactoring that doesn't make sense as part of this rebase.

The upsteam version also has this issue at this time:
openedx#27857

This can be dropped in Quince if the above is merged, or updated if the above
no longer has the issue.
Adds the ability to edit the default course description
shown in certificates.

(cherry picked from commit a89baaf)
(cherry picked from commit b16c266)
This feature help to configure the date formatt in Schedule and Details
settings page.

Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>
Co-authored-by: Joseph Curtin  <jbcurtin@opencraft.com>
(cherry picked from commit 64d44a8)
(cherry picked from commit f2cbb13)
@Agrendalath
Copy link
Member

@xitij2000, do we still need cf844c2? I added it in Maple, but it may no longer be needed for the CI to pass.

@xitij2000
Copy link
Member Author

@xitij2000, do we still need cf844c2? I added it in Maple, but it may no longer be needed for the CI to pass.

Sure! Thanks for that context. I will drop it, along with any other changes you suggest.

@Agrendalath
Copy link
Member

Quick update: I'm currently provisioning devstack to verify this. Some image tags are missing from edxops and openedx, so I needed to do the following steps to provision it successfully:

docker pull edxops/devpi && docker tag edxops/devpi edxops/devpi:palm.master

# From edx-platform/
DOCKER_BUILDKIT=1 docker build . --build-arg SERVICE_VARIANT=lms --build-arg SERVICE_PORT=8000 --target development -t openedx/lms-dev:palm.master
# This one may not be needed because devstack uses the `lms-dev` image for both LMS and Studio.
DOCKER_BUILDKIT=1 docker build . --build-arg SERVICE_VARIANT=cms --build-arg SERVICE_PORT=8010 --target development -t openedx/cms-dev:palm.master

# From configuration/
docker build -f docker/build/forum/Dockerfile . -t edxops/forum:palm.master
docker build -f docker/build/ecommerce/Dockerfile . -t edxops/ecommerce:palm.master

@xitij2000
Copy link
Member Author

Quick update: I'm currently provisioning devstack to verify this. Some image tags are missing from edxops and openedx, so I needed to do the following steps to provision it successfully:

docker pull edxops/devpi && docker tag edxops/devpi edxops/devpi:palm.master

# From edx-platform/
DOCKER_BUILDKIT=1 docker build . --build-arg SERVICE_VARIANT=lms --build-arg SERVICE_PORT=8000 --target development -t openedx/lms-dev:palm.master
# This one may not be needed because devstack uses the `lms-dev` image for both LMS and Studio.
DOCKER_BUILDKIT=1 docker build . --build-arg SERVICE_VARIANT=cms --build-arg SERVICE_PORT=8010 --target development -t openedx/cms-dev:palm.master

# From configuration/
docker build -f docker/build/forum/Dockerfile . -t edxops/forum:palm.master
docker build -f docker/build/ecommerce/Dockerfile . -t edxops/ecommerce:palm.master

I just tested on tutor since I've been working on moving to that as a devtack.

kaustavb12 and others added 11 commits June 26, 2023 13:34
…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)
This change adds a new waffle switch to redirect a student to coursware after
enrolment instead of the dashboard.

(cherry picked from commit dbce322)
…rd API

Without this, files with BOM (byte order mark; generated e.g., by Microsoft
Excel) cannot be read properly.

(cherry picked from commit 7d8a502)
It was an artificial limit enforced by the frontend. The backend does not have
limitations that would prevent it from using a higher value.

(cherry picked from commit 08e9ec3)
(cherry picked from commit 2a5f33a)
(cherry picked from commit 0e9cd01)
…account is unlinked

(cherry picked from commit e83a8c8)
@Agrendalath
Copy link
Member

@xitij2000, I didn't find anything obvious that would be broken 👍🏻 Let's include #541 and #544, and run the tests again - they seem to be stuck.

I just tested on tutor since I've been working on moving to that as a devtack.

I couldn't figure out how to apply a single theme to multiple MFEs, so I gave up and used devstack.

@Agrendalath
Copy link
Member

@xitij2000, also, could you please add the description to the PR?

kaustavb12 and others added 2 commits June 27, 2023 11:09
(cherry picked from commit 7a7af8c)
(cherry picked from commit 9475431)
(cherry picked from commit 8ef5575)
(cherry picked from commit 8e281a9)
@xitij2000
Copy link
Member Author

@xitij2000, I didn't find anything obvious that would be broken 👍🏻 Let's include #541 and #544, and run the tests again - they seem to be stuck.

Done.

@xitij2000, also, could you please add the description to the PR?

Done.

Copy link
Member

@Agrendalath Agrendalath left a comment

Choose a reason for hiding this comment

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

@xitij2000, thanks!

👍

  • I tested this: checked that the basic functionality works correctly in the devstack
  • I read through the code
  • I checked for accessibility issues: n/a
  • Includes documentation: n/a
  • I made sure any change in configuration variables is reflected in the corresponding client's configuration-secure repository: n/a

@xitij2000 xitij2000 merged commit 05324a5 into opencraft-release/palm.1 Jun 27, 2023
40 checks passed
@xitij2000 xitij2000 deleted the kshitij/palm-release branch June 27, 2023 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
9 participants