Diana Huang
|
51db547a63
|
Merge branch 'master' into diana/rubric-ui-improvements
Conflicts:
common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
|
2013-02-05 16:18:56 -05:00 |
|
Diana Huang
|
f3be02d772
|
Merge branch 'master' into diana/rubric-ui-improvements
|
2013-02-05 09:13:14 -05:00 |
|
Vik Paruchuri
|
cbd0895aad
|
Add in single peer grading problem view
|
2013-02-04 16:42:14 -05:00 |
|
Diana Huang
|
68fc794a97
|
Add in some better encouragement to write feedback
|
2013-02-01 15:15:42 -05:00 |
|
Vik Paruchuri
|
c1583dbba2
|
Properly load javascript, fix templates to work with xmodule, modify AJAX handlers
|
2013-01-31 19:57:35 -05:00 |
|
Vik Paruchuri
|
c2f644656d
|
Fix HTML return
|
2013-01-31 19:12:49 -05:00 |
|
Vik Paruchuri
|
bdb82cda65
|
Strip out JS, old urls
|
2013-01-31 18:23:30 -05:00 |
|
Vik Paruchuri
|
5f538f078b
|
Pass flag through from LMS to grading controller
|
2013-01-30 19:50:36 -05:00 |
|
Diana Huang
|
77fe6ed452
|
Merge branch 'master' into feature/diana/rubric-input
|
2013-01-15 14:48:40 -05:00 |
|
Vik Paruchuri
|
301293f8b0
|
Remove debug statement, fix active page issue on problem page
|
2013-01-15 14:33:38 -05:00 |
|
Diana Huang
|
3d2ae66cf5
|
Refactor out rubric rendering and pass along
the right information for peer grading
|
2013-01-15 13:46:18 -05:00 |
|
Diana Huang
|
48be0b15a1
|
Clean up on staff grading code path and
the beginnings of peer grading.
|
2013-01-15 11:21:10 -05:00 |
|
Diana Huang
|
c4d1b2e643
|
Use correct user id and make the reload button a back button
|
2013-01-09 14:41:23 -05:00 |
|
Diana Huang
|
e410703e33
|
Minor bug fixes and improvements
|
2013-01-04 17:20:03 -05:00 |
|
Diana Huang
|
093560e859
|
Updates to copy and styling and a few bugfixes
|
2013-01-04 16:36:28 -05:00 |
|
Diana Huang
|
fa09e25a1a
|
Add interstitial page between calibration and grading.
Make individual Prompt and Rubric Sections hideable.
|
2013-01-04 15:18:39 -05:00 |
|
Diana Huang
|
befe36f626
|
Improvements to calibration feedback step
|
2013-01-04 14:11:48 -05:00 |
|
Diana Huang
|
ad63c492be
|
Minor updates to the page to handle showing Calibration feedback.
Also, allow for the hiding of the Prompt and the Rubric.
|
2013-01-04 12:42:38 -05:00 |
|
Diana Huang
|
b5f34a9da6
|
Show special text when calibrating or when grading.
|
2013-01-04 11:03:24 -05:00 |
|
Diana Huang
|
becffd4dbb
|
Updated html and javascript for new pages as well
as a fix for the peer grading service
|
2013-01-03 14:08:56 -05:00 |
|
Diana Huang
|
c0001597a3
|
Update some of the templates so that they don't break
|
2013-01-03 13:47:29 -05:00 |
|
Diana Huang
|
c89ff2ac0e
|
Basic peer grading view using mocks and some cleanup in
the peer grading service
|
2013-01-02 17:44:58 -05:00 |
|
Diana Huang
|
37f261f906
|
Move peer grading so that there are the individual problem pages
and the problem list page
|
2013-01-02 15:01:59 -05:00 |
|