Commit Graph

6923 Commits

Author SHA1 Message Date
Vasyl Nakvasiuk
8cf8dcd10b rm videoalpha_list method 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
de94855ba0 use one general dictionary self.sources for videoalpha_module 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
a2d9df9d34 add "sub" to <video> tag in xml lessons 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
d72036a6dc add support sub attribute for <video> tag 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
3ac9d54ff7 fix wemb -> webm 2013-02-14 11:22:13 +02:00
Valera Rozuvan
067f2e97f5 Enabled play/pause buttons for HTML5 video player. 2013-02-14 11:22:12 +02:00
Vasyl Nakvasiuk
786c11484e <videoalpha> tag now support multi-source 2013-02-14 11:22:12 +02:00
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
Brian Wilson
f0258b8dd0 first pass at pdfbook 2013-02-13 18:01:44 -05:00
Diana Huang
943a565717 Log rubric selection clicks 2013-02-13 16:48:58 -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
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
9e5eca1417 Swap b tag for span 2013-02-13 11:29:18 -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
Diana Huang
285e575895 Update copy to be clearer about the workflow. 2013-02-11 17:29:45 -05:00
Arthur Barrett
a144896154 Style and behavior changes to the header and tooltips. 2013-02-11 16:17:34 -05: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
4e071d086f Fix staff grading ML error info a bit 2013-02-11 11:31:26 -05:00
Diana Huang
d3d3a03c61 Add checkbox and make sure to uncheck it after submission 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
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
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
Arthur Barrett
a9773eb888 Updated markup, styling, and tooltip behavior for displaying instructor comments. Added drag/drop to the comments so the user can organize them as they wish after clicking on the span. When the user hides the annotations, their positions on the screen are remembered so they can be restored later. Also modified the markup so that block content can be displayed. 2013-02-08 20:38:24 -05:00
Your Name
7761f6cb04 make cohort filter visibility conditional on selected commentable cohortedness 2013-02-08 17:22:29 -05:00
Your Name
b980399f5f change cohort dropdown verbiage 2013-02-08 15:41:11 -05:00
Victor Shnayder
0e06f5f587 Merge remote-tracking branch 'origin/feature/kevin/groups_ui_changes' into feature/victor/revert-revert-of-forums-ui 2013-02-08 15:01:30 -05:00
Victor Shnayder
6d9a9ec46f Revert "Merge pull request #1452 from MITx/silly/victor/revert-forums-merge"
This reverts commit e4819a1b55, reversing
changes made to b6ec41cae0.

Now that we're ready to test again, need to revert the revert to put the filtering UI back in.
2013-02-08 15:00:25 -05:00