Vik Paruchuri
68eb802516
Remove images from status bar after finding out that they run afoul of the rewriting of static links. Need to send them back via ajax to avoid
2013-02-07 18:48:13 -05:00
Vik Paruchuri
4973363353
Attach images to rubric to indicate which graders scored what
2013-02-07 18:35:09 -05:00
Vik Paruchuri
a2d9e66634
Centralized rubric now displays properly
2013-02-07 18:21:50 -05:00
Vik Paruchuri
9fa16b07d6
Remove ability to manually get results
2013-02-07 18:02:48 -05:00
Vik Paruchuri
c4bf9a0be4
Modify rubric category rendering
2013-02-07 17:47:19 -05:00
Vik Paruchuri
7bf0532a04
Fix some issues with displaying grader info on rubric
2013-02-07 17:28:31 -05:00
Vik Paruchuri
41d35632f3
Working on combined rubric stuff
2013-02-07 17:18:53 -05:00
Vik Paruchuri
9bf53026e6
Tweak box in peer and staff grading views
2013-02-07 14:18:38 -05:00
Vik Paruchuri
62435b4c27
Clean up results display
2013-02-07 14:12:14 -05:00
Vik Paruchuri
1cf8326b32
Make status bar, minor CSS fixes
2013-02-07 14:03:43 -05:00
Vik Paruchuri
b1726dae99
Fix prompt UI in combined open ended to close by default and be collapsible
2013-02-07 13:48:32 -05:00
Vik Paruchuri
5ef4af5afd
Fix peer and staff grading interfaces
2013-02-07 12:54:36 -05:00
Vik Paruchuri
ade44c330d
Make staff grading interface much nicer
2013-02-07 12:45:08 -05:00
Vik Paruchuri
baba8d3a36
Add collapse action into staff grading view
2013-02-07 12:42:05 -05:00
Vik Paruchuri
3457b86bd0
Fix JS, style student response box
2013-02-07 12:36:57 -05:00
Vik Paruchuri
c195fe65cd
Restyle rubric list, submission container
2013-02-07 11:10:29 -05:00
Vik Paruchuri
aa699905d6
Feedback and view only rubric restyle
2013-02-07 10:32:39 -05:00
Vik Paruchuri
f22849ebdd
Re-arrange feedback, fix rubric HTML issue
2013-02-07 10:29:58 -05:00
Vik Paruchuri
b30407d7c8
Work on showing results properly
2013-02-07 10:22:33 -05:00
Vik Paruchuri
de8e1e9472
Change around some names, restyle rubric
2013-02-07 09:57:41 -05:00
Vik Paruchuri
03a6572bbe
Restyle status, get rubric to work properly
2013-02-07 09:49:56 -05:00
Vik Paruchuri
2542b6cb72
Merge remote-tracking branch 'origin/master' into feature/vik/improve-oe-ui
2013-02-07 09:26:40 -05:00
Vik Paruchuri
6a6962df9e
Alter rubric list, restyle rubric
2013-02-07 09:26:27 -05:00
David Ormsbee
a6b35853f9
Merge pull request #1455 from MITx/hotfix/dave/youtube_object
...
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
2013-02-06 19:47:25 -08:00
David Ormsbee
976776643b
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
2013-02-06 22:46:22 -05:00
Victor Shnayder
37b735d708
Merge pull request #1454 from MITx/hotfix/dave/youtube_object
...
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 19:41:12 -08:00
David Ormsbee
a470a62d12
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 22:37:41 -05:00
Victor Shnayder
2af06ef1d4
Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 66889b87240dd9c24e74
2013-02-06 20:29:17 -05:00
Victor Shnayder
884a7a61b9
Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 965e3b4c491a7d2a06a8
2013-02-06 20:27:01 -05:00
Victor Shnayder
edf96036c8
Merge remote-tracking branch 'origin/master' into 7012x-clean
2013-02-06 18:53:14 -05:00
Victor Shnayder
965e3b4c49
Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes
...
addressed somme comments in pull request and instructor fixes and blank ...
2013-02-06 15:40:33 -08:00
Kevin Chugh
1dd0ef274d
addressed somme comments in pull request and instructor fixes and blank group fix
2013-02-06 18:26:41 -05:00
Victor Shnayder
1a7d2a06a8
Merge pull request #1442 from MITx/marketing/reg-tweak
...
Fix placeholder email in signup form
2013-02-06 15:26:26 -08:00
Kevin Chugh
55c205b9b4
merged master
2013-02-06 17:13:52 -05:00
Vik Paruchuri
83608fd983
Restyle lists
2013-02-06 16:58:59 -05:00
Vik Paruchuri
28a0e44120
Quick rubric restyle
2013-02-06 16:57:10 -05:00
Vik Paruchuri
8bc98b2ff8
Fix sass
2013-02-06 16:32:16 -05:00
Vik Paruchuri
48719a7a45
Merge branch 'feature/vik/oe-versioning' into feature/vik/improve-oe-ui
...
Conflicts:
common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
lms/static/sass/course/_staff_grading.scss
2013-02-06 16:04:01 -05:00
Vik Paruchuri
9e4e98ef74
Fix some css to get things to properly close/open
2013-02-06 15:13:56 -05:00
Vik Paruchuri
02ac72d0af
Doing some restyling on peer grading
2013-02-06 13:49:59 -05:00
Diana Huang
4adf2f6180
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
2013-02-06 13:16:24 -05:00
Diana Huang
1f5beba383
Merge branch 'master' into diana/rubric-ui-improvements
2013-02-06 13:12:04 -05:00
Your Name
6b4a1dfd34
minor tweaks after testing
2013-02-06 12:54:06 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Diana Huang
95d3957377
Merge pull request #1438 from MITx/feature/vik/peer-grading-xmodule
...
Patch peer grading tab to work
2013-02-06 06:07:18 -08:00
ichuang
0936f448fc
add disable_progress_graph key to course metadata
2013-02-06 03:45:10 +00:00
Kevin Chugh
c7a133470d
inline discussions working
2013-02-05 22:43:09 -05:00
Victor Shnayder
219c51f898
Fix placeholder email in signup form
2013-02-05 22:24:20 -05:00
Victor Shnayder
739938f35f
add readme for symbolicresponse implementation (thanks Ike!)
2013-02-05 20:15:48 -05:00
David Ormsbee
a3a886bd0f
Revert "Add tests for django-comment-client models" (which actually had
...
a model change as well)
This reverts commit 053547453e
2013-02-05 18:51:16 -05:00
