Forward Port #54: Don't cause 500 error when get_block returns None - #55
Merged
Conversation
…and v2 installed in parallel
…eserialization to rely on field parser rather than custom parsing Fixed xml test fixtures
Remove custom deserialization code
Added notifications for locking navigation on supported platforms.
Additional feedback
InstructorToolBlockWithMixins" error that gets thrown when trying to edit Instructor Tool blocks in Studio.
it works for non-eligible blocks with empty "Question title" (display_name).
This ensures that export results correctly reflect changes to answers associated with Long Answer blocks.
if "question" attribute is not set to a meaningful value.
Instructor Tool: Drop-down for "Root block ID" section, pagination improvements (OC-783)
Visual improvements to Table block.
Fix JS bug when HTML block is followed by an answer block
Allow toggling show_title behaviour during upgrade (OC-805)
Fix two bugs (OC-839)
Add an extra selector to fix CSS rule ambiguity
bradenmacdonald
force-pushed
the
master-candidate
branch
from
July 30, 2015 22:19
348ff21 to
36cd10b
Compare
Member
Author
|
Note: GitHub got confused; the only change merged here was 36cd10b |
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
7 participants
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.
Forward port of #54, which is already reviewed for the
edx-releasebranch.