Update master with fixes from PR 80 #83
Merged
Conversation
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
The link is only used during extended feedback in assessment mode. It's hidden on page load by JS in all cases, and only shown if the student goes back to a question after using up all attempts, so we can just as well hide it in CSS. This fixes MCKIN-3099.
Fix max attempts message
Hide "Review final grade" link by default.
Test + fix for crash when block is deleted after students have used it
Assessment style tweaks
…erfect-score-in-the-past scenario
(cherry picked from commit f13d337)
… answer blocks as incomplete on first load (+tests)
Feedback persistence
This reverts commit 78decd9.
…candidate Conflicts: problem_builder/mentoring.py problem_builder/questionnaire.py problem_builder/tests/integration/test_dashboard.py problem_builder/tests/integration/xml/assessment_2.xml problem_builder/tests/integration/xml/mcq_with_html_choices.xml problem_builder/tests/integration/xml/mrq_with_comments_1.xml problem_builder/tests/integration/xml/mrq_with_html_choices.xml problem_builder/tests/integration/xml_templates/assessment.xml problem_builder/v1/tests/xml/v1_upgrade_a_new.xml problem_builder/v1/tests/xml/v1_upgrade_b_new.xml run_tests.py test_requirements.txt
Merging edx-release into master
Fixed submit button being enabled after page reload
Update requirements (xblock-utils fixes for OC-988)
Enable seamless use of steps that have no questions.
Allow Videos and images to be added to Mentoring Step Block.
Step Builder: New block type: "Plot"
Step Builder: New question type: "Scale" (OC-1009)
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.
This pulls in #80 from the
edx-releasebranch.