Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg (cd2a704a) · 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

cd2a704a

Commit cd2a704a authored 12 years ago by Brian Wilson

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg

parents ef0f973c 78c194aa

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

lms/djangoapps/courseware/tabs.py 50 additions, 2 deletions

lms/djangoapps/courseware/tabs.py
lms/djangoapps/open_ended_grading/peer_grading_service.py 6 additions, 0 deletions

lms/djangoapps/open_ended_grading/peer_grading_service.py
lms/djangoapps/open_ended_grading/staff_grading_service.py 7 additions, 0 deletions

lms/djangoapps/open_ended_grading/staff_grading_service.py
lms/static/coffee/src/staff_grading/staff_grading.coffee 1 addition, 1 deletion

lms/static/coffee/src/staff_grading/staff_grading.coffee
lms/templates/courseware/course_navigation.html 6 additions, 1 deletion

lms/templates/courseware/course_navigation.html
lms/templates/peer_grading/peer_grading.html 2 additions, 2 deletions

lms/templates/peer_grading/peer_grading.html
lms/templates/peer_grading/peer_grading_problem.html 1 addition, 1 deletion

lms/templates/peer_grading/peer_grading_problem.html

with 73 additions and 7 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