Skip to content

[SE-3856] Cherry picks the internal code drift from juniper 3 used by Autodesk - #313

Merged
nizarmah merged 9 commits into
opencraft-release/koa.1from
autodesk-release/koa.1
Feb 4, 2021
Merged

[SE-3856] Cherry picks the internal code drift from juniper 3 used by Autodesk#313
nizarmah merged 9 commits into
opencraft-release/koa.1from
autodesk-release/koa.1

Conversation

@nizarmah

@nizarmah nizarmah commented Feb 4, 2021

Copy link
Copy Markdown

This pull request is exactly identical to #310

It is reopened because we need to merge, without "squashing".


Cherry picks the internal juniper 3 code drift used by Autodesk

JIRA tickets: SE-3856

Sandbox URL:

Testing instructions:

  1. Follow the testing instructions from the pull requests linked in SE-3856

Author notes and concerns:

  1. Some of the pull requests were included in Koa, they are also mentioned in SE-3856
  2. Please don't squash and merge, it is important that those cherry-picked commits are mentioned explicitly

Reviewers

pkulkark and others added 9 commits January 20, 2021 10:46
Replaces the deprecated CachedFilesMixin with ManifestFilesMixin.
Also sorts xmodules and xblocks js bundles to make theme assets
compilation hashes consistent across different machines.

(cherry picked from commit e9cba8c)
…ctions (openedx#25324)

The clean-js jake command helps remove all minified js files that get generated using the minify bundle jake command

By running clean-js before running the minify command, we ensure that the tinymce files are consistent after being rebuilt/minified.

This is helpful with multiple app servers that are applying the same changes to the TinyMCE editor

This ensures that no matter on which machine the files are rebuilt, the resulting minified plugin files are consistent among all

(cherry picked from commit b49ebb9)
(cherry picked from commit 57cb1d40a047aabbc5b0acfbce2d3b4c62b0ecca)
…image-url

[SE-3329] Expose banner image url in course API

(cherry picked from commit 6a55b83)
…hitelist

Sets default X-Frame-Options for login and registration forms to environment setting

(cherry picked from commit bb0492e)
(cherry picked from commit b22471d6760aa8e874e947de15144d2262696fd8)
…edx#25935)

(cherry picked from commit 914410a47b50933e5a92e2e77e0dbc85ff405cce)
@nizarmah
nizarmah requested a review from 0x29a February 4, 2021 11:45

@0x29a 0x29a left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

👍

  • I checked that hash of a last commit is the same as in #310

@nizarmah
nizarmah merged commit a67780b into opencraft-release/koa.1 Feb 4, 2021
@nizarmah
nizarmah deleted the autodesk-release/koa.1 branch February 4, 2021 11:58
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.

4 participants