Merging edx-release into master #32
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
Dashboard Block (OC-560)
…eserialization to rely on field parser rather than custom parsing Fixed xml test fixtures
Hotfix: Four minor issues to address before release
* Horizontally centering visual progress * Ability to override "Average" label * Added ability to hide numbers in dashboard * Ability to exclude specific questions from dashboard * Slightly improved a11y (aka accessibility)
Presentation updates
Hotfix for OC-639: Database conflict between mentoring and problem_builder
Allowed overriding average labels per mentoring
* All dashboard tables are 700px wide and centered * Color codes made square * "Average" row label made semi-bold (font-weight: 600)
…ole so it's hard to see which tests have failed and stacktraces
Presentation updates, part 2
…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
Member
|
👍 This looks good to me. I see it's now mostly the dashboard presentation changes that are in the diff and not much else. Thanks @e-kolpakov. |
e-kolpakov
added a commit
that referenced
this pull request
May 13, 2015
Merging edx-release into master
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.