Commit Graph

22621 Commits

Author SHA1 Message Date
Valera Rozuvan
ed00d20708 Updated all coffee scripts to define and use Alpha version of classes. Added missing functions for HTML5Video.Player prototype. Now bare bones works without errors. YouTube version also works without errors. 2013-02-14 11:22:12 +02:00
Valera Rozuvan
ca83c3953a Adding HTML5Video class and modifying coffee sources to use it when video sources are provided instead of YouTube IDs. 2013-02-14 11:22:12 +02:00
Valera Rozuvan
7c7e09500a Renamed videox to videoalpha, as per Piotr naming scheme request. 2013-02-14 11:22:12 +02:00
Vik Paruchuri
6a10ffc7da Fix up error messages to staff and students 2013-02-13 19:12:16 -05:00
Vik Paruchuri
00bc8deefa Minor work on errors shown within the JS 2013-02-13 18:45:34 -05:00
Vik Paruchuri
8b12f26626 Fix error messages to staff 2013-02-13 18:24:33 -05:00
Brian Wilson
f0258b8dd0 first pass at pdfbook 2013-02-13 18:01:44 -05:00
Diana Huang
93f2bf194c Log showing and hiding of questions. 2013-02-13 16:48:58 -05:00
Diana Huang
943a565717 Log rubric selection clicks 2013-02-13 16:48:58 -05:00
Calen Pennington
50af0be13d Fix course short description display (now that they're xmodules) 2013-02-13 16:17:12 -05:00
Calen Pennington
927da34477 Fix data_dirs for /static link replacement 2013-02-13 16:15:22 -05:00
Vik Paruchuri
48a5c9f0b2 Remove score display from status bar 2013-02-13 16:05:12 -05:00
Arthur Barrett
010593be6f Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-13 15:39:41 -05:00
Vik Paruchuri
02b0bc2923 Add in answer unknown container/checkbox to pass back to controller 2013-02-13 15:37:42 -05:00
Vik Paruchuri
7a3a56d4bc Fixing tests 2013-02-13 15:20:59 -05:00
Vik Paruchuri
5f29e0e1a6 Fix OE tests 2013-02-13 15:11:37 -05:00
Calen Pennington
f0f7e0dc1c Fix more tests 2013-02-13 14:22:08 -05:00
Calen Pennington
bd822b9d2f Fix tests post-merge 2013-02-13 14:13:22 -05:00
Calen Pennington
793bbfd351 Set up dev environment for testing xml vs mongo vs split_mongo modulestores 2013-02-13 14:04:21 -05:00
Ned Batchelder
857edaf6f3 Remove dogfood and quickedit. 2013-02-13 12:23:08 -05:00
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