[BB-6692] Prepare opencraft-release/nutmeg.2 branch for edx-platform - #490
Merged
0x29a merged 15 commits intoOct 6, 2022
Merged
Conversation
0x29a
force-pushed
the
0x29a/bb6692/cherrypick-code-drift-to-nutmeg
branch
6 times, most recently
from
September 22, 2022 14:59
a1455ec to
40ad3e1
Compare
Author
Testing results
|
opencraft-release/nutmeg.2 branch for edx-platformopencraft-release/nutmeg.2 branch for edx-platform
Agrendalath
approved these changes
Oct 5, 2022
Agrendalath
left a comment
Member
There was a problem hiding this comment.
@0x29a, whoa, thank you for the amazing description of this PR and the detailed testing report! I've left few small comments, but these are not blockers.
👍
- I tested this: checked the features locally
- 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-securerepository: n/a
0x29a
force-pushed
the
0x29a/bb6692/cherrypick-code-drift-to-nutmeg
branch
4 times, most recently
from
October 5, 2022 16:27
88cacde to
220780f
Compare
…dx#29326) Implements a feature flag DISABLE_UNENROLLMENT that is used to disable students un-enrollment for all courses. The Unenrollment option should be disabled when this feature is set to True. ref: BB-4951 Co-authored-by: tinumide <tinuade@opencraft.com> Co-authored-by: Tim McCormack <tmccormack@edx.org> (cherry picked from commit da4a6d6)
… endpoint (squashed and cherry picked from openedx#20948) NOTE 1: during a next release preparation, don't cherry-pick the original commit, as they are heavily outdated. Cherry-pick this one, as it has linting and compatibility fixes. NOTE 2: `max_mongo_calls` in `EnrollmentTestMixin` was bumped from 8 to 12.
(cherry picked from commit d393d6e AND fixed linting issues)
(cherry picked from commit ed4c7cc)
(cherry picked from commit 557f58c)
Most tags that could contain solutions or hints were already being removed, but the regex did not include the case when they contained attributes. (cherry picked from commit 0ef57eb)
This makes the reset button to refresh the contents of a Randomized Content Block (RCB) without reloading the full page by fetching a new set of problems in the "reset" response and replacing the DOM contents. The reset button returns the student view as a string and the client uses the HtmlUtils package to replace the contents and reinitializes the XBlock. This allows students to use the RCB as a flash card system. Co-authored-by: tinumide <tinuade@opencraft.com> (cherry picked from commit 2b39da6)
(cherry picked from commit c812a6c1d5c0961900507a6e7abe3d0f3b8a7570)
Adds the ability to edit the default course description shown in certificates. (cherry picked from commit a89baafe0575c94fac0cb4ce9db1d38ce0b71bc6)
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 85d99bb)
This fixes the issue of django messages being read before redirecting to dashboard page, due to enterprise api being called even if the feature is disabled. (cherry picked from commit df489bd)
…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)
This setting allows loading of Resource Templates from outside the edx-platform codebase. Operators will be able to add their own custom resource templates without needing to fork the codebase. (cherry picked from commit ed81774)
0x29a
force-pushed
the
0x29a/bb6692/cherrypick-code-drift-to-nutmeg
branch
from
October 5, 2022 16:39
220780f to
667ab7f
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
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 prepares the shared
opencraft-release/nutmeg.2branch for our fork of https://github.com/openedx/edx-platform.Code-drift commits
open-release/nutmeg.2WaffleFlag.Supporting information
demid+test@opencraft.com;edxSuggested sandbox configuration
Testing instructions
36b0a19
You shouldn't be able to un-enroll from the course.
5eef411
d393d6e
Doesn't need to be tested separately.
b0fc6de
5a53418
Doesn't need to be tested separately.
20c416a
7344a4e
"anything else". You should see the following result: "You should not see anything else.".a5fae17
Show Reset Buttonoption toTrue.Reset Problemsbutton on the bottom left part of the Randomized Content Block.d0e6c30
verified@example.comas the staff for the courseverified@example.comon the studio pageverified@example.comshould not be able to see the delete button on the course outline page.09c0b96
4ed429f
DD/MM/YYYY85d99bb
Tests are passing, so this doesn't need to be tested.
ca32428
44b956b
TODO: find a way to test that the hash is MD5.
dd75da6
settings.CUSTOM_RESOURCE_TEMPLATES_DIRECTORYto a valid path.htmldirectory.common/lib/xmodule/xmodule/templates/htmlto the above directory with a different filename.