Victor Shnayder
4f8757600a
merge
2013-02-14 12:49:14 -05:00
Victor Shnayder
5e44846596
Foldit integration.
...
- ops view for the desktop app to talk to
- xmodule that talks to the foldit model and displays the student's state
- grading tweak to make grade updates from an external service work:
- Add an always_recalculate_grades property to XModuleDescriptor.
2013-02-14 12:45:06 -05:00
Victor Shnayder
fffbb55944
Make hidden_module not cause 500 errors by adding a get_html()
2013-02-14 12:45:01 -05:00
Carlos Andrés Rocha
1f61f6ce08
Merge pull request #1409 from MITx/feature/valera/video_alpha
...
Feature/valera/video alpha
2013-02-14 08:08:57 -08:00
Victor Shnayder
e352226df5
Merge remote-tracking branch 'origin/master' into 700x-sandbox
2013-02-14 09:19:25 -05:00
Vasyl Nakvasiuk
237e6ff6a8
merge
2013-02-14 11:33:04 +02:00
Vasyl Nakvasiuk
93000af79d
fix problem with mutable default value in VideoAlphaModule._get_source
2013-02-14 11:30:21 +02:00
Valera Rozuvan
92dc8859a3
YouTube HTML5 mode is used by default. Fix typo in video alpha template.
2013-02-14 11:22:14 +02:00
Valera Rozuvan
1254e11836
Fixes and additions. Addressing comments by Carlos for pull request 1409.
2013-02-14 11:22:14 +02:00
Vasyl Nakvasiuk
b69b88a718
some small fix
2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
b229abd396
add xml exmaple for videoalpja module in docstring
2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
8cf8dcd10b
rm videoalpha_list method
2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
0b73f0a59d
remove unnecessary code
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
Valera Rozuvan
7d851b9f5d
Fixed bug when switching speeds in YouTube HTML5 player.
2013-02-14 11:22:13 +02:00
Valera Rozuvan
e59994a4b8
Finalized HTML5 YouTube player inbrowser speed changes.
2013-02-14 11:22:13 +02:00
Valera Rozuvan
b2bffb010e
Work on adding native spped change for YouTube HTML5. Not complete.
2013-02-14 11:22:13 +02:00
Valera Rozuvan
eff8ad6762
Fixed bug with HTML5 start end options. Now can specify an interval of video which must be played.
2013-02-14 11:22:13 +02:00
Valera Rozuvan
b5bd7a697f
Added start and end time support.
2013-02-14 11:22:13 +02:00
Valera Rozuvan
5129be978f
Fixed bugs. Removed unnecessary things from HTML5. Minor improvements. Subtitles now work in HTML5 if specified.
2013-02-14 11:22:13 +02:00
Valera Rozuvan
e737522bb7
Fixed bug with jumpy timeline when switching speeds. Enabled show_captions option. Added JS support for subtitles in HTML5 mode.
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
Vasyl Nakvasiuk
5cce568836
add docstrings in videoalpha_module.py
2013-02-14 11:22:13 +02:00
Valera Rozuvan
4f08d96cfd
Added ability to change playback rate, added pause/play on video click, minor improvements.
2013-02-14 11:22:12 +02:00
Valera Rozuvan
80fa9d0116
Added support for time line in HTML5.
2013-02-14 11:22:12 +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
ichuang
e413d16bff
allow "rows" attrib of coderesponse textbox to set box height
2013-02-13 21:25:31 -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
