Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,110 Commits 1 Branch 0 Tags
68eb802516a5b2afdcf874dfd7a36e6c6e9a85cc
Commit Graph

10110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f5fcd3e1ff Make grader image dict a constant 2013-02-07 18:37:03 -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
5154068d75 Debug some score tuple issues 2013-02-07 17:33:03 -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
0f81b0f816 Aggregate rubric feedback 2013-02-07 16:51:51 -05:00
Vik Paruchuri
47d5fe60ef Return feedback items individually 2013-02-07 16:43:21 -05:00
Vik Paruchuri
091f34668b Support centralized results 2013-02-07 16:40:25 -05:00
Vik Paruchuri
4b5457c997 Fixing some rubric score errors 2013-02-07 16:13:07 -05:00
Vik Paruchuri
4a897d4e7f Save rubric scores in self assessment 2013-02-07 15:52:23 -05:00
Vik Paruchuri
3874fe545a Working on making a combined rubric 2013-02-07 15:46:49 -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
198885f7e0 Move elements around, do some restyling 2013-02-07 10:40:15 -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
9a5a988116 Revert peer grading problem to master version 2013-02-07 09:29:24 -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
18ddd1ee56 Merge pull request #1453 from MITx/victor/protex 
Victor/protex
 2013-02-06 18:03:53 -08:00
jmclaus
2627a2f12c Protex now loads correctly in every scenario 2013-02-06 20:49:23 -05:00
jmclaus
98865bb7c0 Loading bug fixed by ugly hack 2013-02-06 20:49:16 -05:00
jmclaus
85b92f30de GWT now does no set any target shape in onModuleLoad() 2013-02-06 20:49:06 -05:00
jmclaus
e27b1e04a7 Fixed small alighment pb, decreased font size of text box 2013-02-06 20:48:57 -05:00
jmclaus
3bd7e1b703 Crisper AA letters, canvases non-selectable 2013-02-06 20:48:48 -05:00
jmclaus
ef232c5976 Few bug fixes 2013-02-06 20:48:40 -05:00
jmclaus
f6dacff41e Fixed layout, increased size of markers on proteins 2013-02-06 20:48:32 -05:00
jmclaus
5737f58b95 Added GWT Protex - reads target shape from xml writes answer to hidden input field 2013-02-06 20:48:25 -05:00
Victor Shnayder
e4819a1b55 Merge pull request #1452 from MITx/silly/victor/revert-forums-merge 
Silly/victor/revert forums merge
 2013-02-06 17:41:14 -08:00
Victor Shnayder
2af06ef1d4 Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes" 
This reverts commit 66889b8724, reversing
changes made to 0dd9c24e74.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.
 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 965e3b4c49, reversing
changes made to 1a7d2a06a8.

I accidentally merged this before it was ready.  This was silly, so now I'm undoing it.  We'll need to revert the revert later.
 2013-02-06 20:27:01 -05:00
Victor Shnayder
b6ec41cae0 Merge pull request #1432 from MITx/7012x-clean 
7012x clean
 2013-02-06 15:58:29 -08:00