Merge pull request #1066 from edx/giulio/ORA-fixes-2 (7d4ccf62) · Commits · Hsin-Yu Chien / edx-platform-release · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

edx-platform-release
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

7d4ccf62

Commit 7d4ccf62 authored 11 years ago by Giulio Gratta

Downloads
- Plain Diff

Merge pull request #1066 from edx/giulio/ORA-fixes-2

Second batch of ORA UI fixes (with an ICE bonus!)

parents 42f286b3 bbd902f8

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

common/lib/xmodule/xmodule/js/fixtures/rubric.html 1 addition, 1 deletion

common/lib/xmodule/xmodule/js/fixtures/rubric.html
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee 5 additions, 5 deletions

...b/xmodule/xmodule/js/src/combinedopenended/display.coffee
common/lib/xmodule/xmodule/js/src/peergrading/ice.min.js 9 additions, 224 deletions

common/lib/xmodule/xmodule/js/src/peergrading/ice.min.js
common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee 13 additions, 5 deletions

...le/xmodule/js/src/peergrading/peer_grading_problem.coffee
common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee 16 additions, 1 deletion

...b/xmodule/xmodule/js/src/peergrading/track_changes.coffee
lms/djangoapps/open_ended_grading/tests.py 1 addition, 1 deletion

lms/djangoapps/open_ended_grading/tests.py
lms/static/sass/course/_staff_grading.scss 1 addition, 1 deletion

lms/static/sass/course/_staff_grading.scss
lms/templates/combinedopenended/combined_open_ended.html 2 additions, 2 deletions

lms/templates/combinedopenended/combined_open_ended.html
lms/templates/combinedopenended/combined_open_ended_results.html 13 additions, 4 deletions

...plates/combinedopenended/combined_open_ended_results.html
lms/templates/open_ended_problems/open_ended_problems.html 31 additions, 31 deletions

lms/templates/open_ended_problems/open_ended_problems.html
lms/templates/peer_grading/peer_grading_problem.html 16 additions, 9 deletions

lms/templates/peer_grading/peer_grading_problem.html

with 108 additions and 284 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment