Release Candidate rc/2016-02-23 #11606
Merged
Conversation
This file contains 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
Mako filesystem/app_directories loaders already wrap default django template loaders. Mako loaders delegate the `load_template_source` method to the base loader that they wrap, so there's no reason to explicitly include the two django loaders in the settings.
The function initializeXBlock() expects a DOM element, and is passed one in most cases. However, when adding a new XBlock component in Studio, the function is passed a jQuery object, which ends up being forwarded to the actual initialisation function of the XBlock.
This can also serve as an example of the kind of changes we want to make.
…in Studio ECOM-3615
It's just as relevant to unit tests and I wish I had seen it earlier. Stress the transient nature of this debugging step.
Add Randomize XBlock to DEPRECATED_BLOCK_TYPES.
MA-1985 add analytics event to thread/comment vote
…-twice Copy this doc up from the bok_choy tests.
Close unclosed p tag
Add monitoring version of package.json
FEDX-47
TE-1194 update for test_teams.
Update translations (autogenerated message)
…ion-with-template Render lms main navigation (tabs) with template
…e_staff_in_ccx Added staff and instructor roles on ccx to all the staff and instructors of the master course plus fixed view as student masquerade and display name of ccx on coach dashboard
Studio homepage escaping
removes unnecessary alt attribute value (empty value is more appropriate)
Remove default django template loaders.
Merging release back to master
The openassessment xblock stores some information that assumes a given student module is never cleared, it needs to be informed of this operation.
Reset state fix
Using display_name_with_default instead of display_name.
Upgraded edx-proctoring to 0.12.10
… data migration for existing ccx courses." This reverts commit 91bf48f.
This reverts commit 920cc3d.
Revert "Inform openassessment to clear submission"
mikekatz
added a commit
that referenced
this pull request
Feb 24, 2016
Release Candidate rc/2016-02-23
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.
No description provided.