Commit Graph

7928 Commits

Author SHA1 Message Date
Diana Huang
943a565717 Log rubric selection clicks 2013-02-13 16:48:58 -05:00
Diana Huang
bb3fc20b8b Fix xmodule jasmine tests so they stop trying to reload
the page
2013-02-13 16:48:58 -05:00
marco
5a283127a4 clean up based on cahrens pull requests notes 2013-02-13 16:41:43 -05:00
Vik Paruchuri
0627b7b9f2 Fix error messages, document 2013-02-13 16:38:33 -05:00
Don Mitchell
50b92378f9 Update and clarify doc strings 2013-02-13 16:34:12 -05:00
Don Mitchell
9d2b92c362 Don't show 'empty' metadata field
Change logic for when to show simple v advanced editor to use an
explicit flag.
2013-02-13 16:34:11 -05:00
Don Mitchell
62d389c853 Added empty metadata attribute instead of using name to determine which
template is empty (very awkward b/c it's a template descriptor not an
instance one)
Changed display conditionals to get the right things to show in the
right tabs for problems
2013-02-13 16:33:19 -05:00
marco
1bb1fb3156 adding remaining advanced problem modes I left off the first pass 2013-02-13 16:33:18 -05:00
marco
18f2f97eb1 edited problem editor tooltips to have new names and also changed sample problem text to use new names 2013-02-13 16:33:17 -05:00
Calen Pennington
04d7146944 Fixing xmodule tests 2013-02-13 16:31:38 -05:00
Vik Paruchuri
26713e072f Work on fixing and documenting error messages shown to students 2013-02-13 16:30:34 -05:00
Calen Pennington
2443aa79a7 Indentation fix 2013-02-13 16:27:29 -05:00
Calen Pennington
927da34477 Fix data_dirs for /static link replacement 2013-02-13 16:15:22 -05:00
Vik Paruchuri
aca73d2123 Start to document and sanitize error messages 2013-02-13 16:13:34 -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
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
Vik Paruchuri
8447eb5460 Remove extraneous debug messages 2013-02-13 11:40:07 -05:00
Vik Paruchuri
833aa01bd4 Add in documentation on tuple matching 2013-02-13 11:38:43 -05:00
Vik Paruchuri
382d4d70ea Minor parsing fix, remove b tag from selectors 2013-02-13 11:35:43 -05:00
Vik Paruchuri
9e5eca1417 Swap b tag for span 2013-02-13 11:29:18 -05:00
Vik Paruchuri
b0e55df13e Alter max attempts 2013-02-13 11:24:21 -05:00
Valera Rozuvan
26094a0421 YouTube HTML5 mode is used by default. Fix typo in video alpha template. 2013-02-13 16:47:06 +02:00
Christina Roberts
0b91c1c346 Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates
clean up templates that were removed from disk - we need to remove from ...
2013-02-13 06:29:35 -08:00
Valera Rozuvan
a7b0dd67b7 Merge branch 'feature/valera/video_alpha' of github.com:MITx/mitx into feature/valera/video_alpha 2013-02-13 14:09:44 +02:00
Valera Rozuvan
6d5e230733 Fixes and additions. Addressing comments by Carlos for pull request 1409. 2013-02-13 14:09:35 +02:00
Vasyl Nakvasiuk
d0ac56ca56 some small fix 2013-02-13 13:35:34 +02:00
Vasyl Nakvasiuk
1f79877a9b add xml exmaple for videoalpja module in docstring 2013-02-13 13:35:10 +02:00
Vasyl Nakvasiuk
e6f1687362 rm videoalpha_list method 2013-02-13 13:28:09 +02:00
Vasyl Nakvasiuk
42b332abb4 remove unnecessary code 2013-02-13 13:11:59 +02:00
Vasyl Nakvasiuk
2a05fdd4d9 use one general dictionary self.sources for videoalpha_module 2013-02-13 11:48:06 +02:00
Valera Rozuvan
df31b3114b Fixed bug when switching speeds in YouTube HTML5 player. 2013-02-13 10:27:57 +02:00
Valera Rozuvan
baf6bbe34a Finalized HTML5 YouTube player inbrowser speed changes. 2013-02-13 10:27:57 +02:00
Valera Rozuvan
143217d6b6 Work on adding native spped change for YouTube HTML5. Not complete. 2013-02-13 10:27:57 +02:00
Valera Rozuvan
bfda8bec89 Fixed bug with HTML5 start end options. Now can specify an interval of video which must be played. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
6729eae90c Added start and end time support. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
0216a0fd35 Fixed bugs. Removed unnecessary things from HTML5. Minor improvements. Subtitles now work in HTML5 if specified. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
83f18fed28 Fixed bug with jumpy timeline when switching speeds. Enabled show_captions option. Added JS support for subtitles in HTML5 mode. 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
0ff68979ea add "sub" to <video> tag in xml lessons 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
219b8e8d45 add support sub attribute for <video> tag 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
c0d024df8e fix wemb -> webm 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
1d08e22718 add docstrings in videoalpha_module.py 2013-02-13 10:27:56 +02:00
Valera Rozuvan
12eda46238 Added ability to change playback rate, added pause/play on video click, minor improvements. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
e37b62e4d3 Added support for time line in HTML5. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
dc267e894f Enabled play/pause buttons for HTML5 video player. 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
4163bb7b06 <videoalpha> tag now support multi-source 2013-02-13 10:27:56 +02:00
Valera Rozuvan
adf0c75d51 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-13 10:27:56 +02:00