Commit Graph

7051 Commits

Author SHA1 Message Date
Vik Paruchuri
e397575732 Remove import statements 2013-02-13 11:46:53 -05:00
Vik Paruchuri
9e5eca1417 Swap b tag for span 2013-02-13 11:29:18 -05:00
Vik Paruchuri
8f7c145957 Remove old import statements 2013-02-13 09:45:29 -05:00
Arthur Barrett
6b5bf319c3 Style and behavior changes. Added return links to discussions. 2013-02-12 19:08:23 -05:00
Brian Wilson
b5378b04b3 change timer to calculate relative duration in javascript 2013-02-12 12:25:11 -05:00
Arthur Barrett
45a27f303f Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-12 12:09:21 -05:00
Diana Huang
7658cd7a50 Make the text on the peer grading closed page clearer 2013-02-12 11:10:59 -05:00
David Ormsbee
e07b667c02 Merge pull request #1488 from MITx/bug/btalbot/pearson-ie
Resolving an LMS sidebar accordion issue in IE7
2013-02-12 08:01:59 -08:00
Brian Talbot
f33f7134fb lms - pearson: trying to resolve JQUI accordion width bug in IE7 - enforcing width to chapters 2013-02-12 10:34:21 -05:00
Brian Talbot
83e4dfaacb lms - pearson: trying to resolve JQUI accordion width bug in IE7 2013-02-12 09:58:16 -05:00
Vik Paruchuri
b9bf96520e Move open ended grading xmodule support files into a separate directory. apparently prune down on number of imports 2013-02-11 18:43:47 -05:00
Vik Paruchuri
ba650202b4 Add in logic to pass settings to peer grading xmodule 2013-02-11 18:09:57 -05:00
Vik Paruchuri
01e8fe8d08 Pass S3 interface in module_render 2013-02-11 17:54:37 -05:00
Vik Paruchuri
0f71f5b92e Finish settings refactor 2013-02-11 17:36:33 -05:00
Vik Paruchuri
aca5e2300b Fix dev settings 2013-02-11 17:33:16 -05:00
Vik Paruchuri
9bca4ebf21 Start to refactor grading settings 2013-02-11 17:32:11 -05:00
Diana Huang
285e575895 Update copy to be clearer about the workflow. 2013-02-11 17:29:45 -05:00
Ned Batchelder
aa2d0ecaf2 We no longer need override_settings, Django has a better one. 2013-02-11 17:06:35 -05:00
Arthur Barrett
a144896154 Style and behavior changes to the header and tooltips. 2013-02-11 16:17:34 -05:00
Your Name
a3b4697573 fix css for comments popping 2013-02-11 15:34:28 -05:00
David Ormsbee
75ff2bd6cb Merge pull request #1456 from MITx/fix/cdodge/dangling-discussion-modules
Fix/cdodge/dangling discussion modules
2013-02-11 11:40:00 -08:00
Your Name
7a1aed8945 Merge remote-tracking branch 'origin/master' into feature/victor/revert-revert-of-forums-ui 2013-02-11 13:55:47 -05:00
Vik Paruchuri
58a2186e71 Increase padding a bit 2013-02-11 11:33:44 -05:00
Vik Paruchuri
4e071d086f Fix staff grading ML error info a bit 2013-02-11 11:31:26 -05:00
Vik Paruchuri
920acffd2c Resize student submission box 2013-02-11 11:13:34 -05:00
Vik Paruchuri
838d948c15 Fix padding and border on staff and peer grading panels 2013-02-11 11:07:20 -05:00
David Ormsbee
5d894fdf03 Typo fix 2013-02-11 10:24:07 -05:00
David Ormsbee
04deb30fb6 Factor out the access group generation so we can check staff/instructor status without DB lookup. 2013-02-11 10:17:57 -05:00
David Ormsbee
00b3717829 Use prefetch on user to load groups and prevent extra DB lookups. 2013-02-11 10:16:57 -05:00
Diana Huang
d3d3a03c61 Add checkbox and make sure to uncheck it after submission 2013-02-11 09:23:55 -05:00
Diana Huang
f3bb429915 Get and pass the new submission flagged information through
the controller to the backend.
2013-02-11 09:23:55 -05:00
David Ormsbee
754493597d Merge pull request #1469 from MITx/feature/ichuang/fix-verbose-staff-debug
Fix "staff debug" so it only appears where useful, instead of everywhere
2013-02-10 22:10:53 -08:00
David Ormsbee
fb1e7f3dc1 Make type check for self.code a little more robust, give default val for mmlans so it's never undefined 2013-02-10 19:03:25 -05:00
Vik Paruchuri
d7c60231f0 Fix template icon 2013-02-09 15:13:55 -05:00
Vik Paruchuri
21cca5fb97 Add missing tag 2013-02-09 11:14:12 -05:00
Vik Paruchuri
50ba024ae8 Add additional calibration interstitial page, add in message when calibration essay saved. 2013-02-09 10:43:40 -05:00
Vik Paruchuri
46da4cf241 Add in a better notification icon 2013-02-09 10:15:11 -05:00
Vik Paruchuri
e8cb3590b1 Trim hint and submit messages out of self assessment 2013-02-09 09:06:14 -05:00
Vik Paruchuri
dc9f4a61a2 Enable ability to see full results and to respond to feedback 2013-02-09 08:54:37 -05:00
Vik Paruchuri
6d0af13923 Fix respond to feedback 2013-02-09 08:46:24 -05:00
Vik Paruchuri
3eb18a9ebc Fix status display/make it more robust, and fix module render error 2013-02-09 08:17:20 -05:00
Vik Paruchuri
85324ec83f Restyle creates a combined results view 2013-02-09 01:35:55 -05:00
Vik Paruchuri
a7a55e462d Create a combined results view 2013-02-09 01:11:21 -05:00
Vik Paruchuri
757ff604bf Start to abstract away rendering of feedback from the open ended module into the combined module 2013-02-09 00:44:50 -05:00
Vik Paruchuri
4dc0859fbd Finish refactor of rubric templates, redo some margins 2013-02-09 00:30:25 -05:00
Vik Paruchuri
995a075f8f Separate the rubric templates 2013-02-09 00:18:04 -05:00
Vik Paruchuri
0feb8f66bc Fix colors on legend, add random assessment 2013-02-08 23:59:39 -05:00
Vik Paruchuri
8ef45915df Move legend and status around to find optimal placements 2013-02-08 23:52:44 -05:00
Vik Paruchuri
dbfc77e4a5 Add in legend, move status bar, fix js where it was constantly displaying a message 2013-02-08 23:37:03 -05:00
Vik Paruchuri
70f7185723 Make a legend 2013-02-08 23:27:45 -05:00