Victor Shnayder
|
5134c99d97
|
Merge pull request #1500 from MITx/700x-sandbox
700x sandbox
|
2013-02-14 06:20:02 -08:00 |
|
Victor Shnayder
|
e352226df5
|
Merge remote-tracking branch 'origin/master' into 700x-sandbox
|
2013-02-14 09:19:25 -05:00 |
|
Victor Shnayder
|
f80181be9a
|
Merge pull request #1499 from MITx/feature/ichuang/codeinput-rows-fix
allow "rows" attrib of coderesponse textbox to set box height
|
2013-02-14 06:16:29 -08:00 |
|
Brian Talbot
|
41dc655cce
|
resolving local merge conflict
|
2013-02-14 09:03:46 -05:00 |
|
Brian Talbot
|
54cc51bccf
|
studio - soft landing: changed strong elem colors to be more subtle since we're not using new nomenclature
|
2013-02-14 09:02:51 -05:00 |
|
Brian Talbot
|
557beea31f
|
studio - hiding mast area for subsections
|
2013-02-14 09:00:57 -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
|
d55b818bb2
|
Updated YouTube JS API file to the new one.
|
2013-02-14 11:25:36 +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 |
|
Mark L. Chang
|
b7e8335a19
|
switched taxonomy back to section/subsection/unit
|
2013-02-13 22:53:46 -05:00 |
|
ichuang
|
e413d16bff
|
allow "rows" attrib of coderesponse textbox to set box height
|
2013-02-13 21:25:31 -05:00 |
|
Vik Paruchuri
|
11076e759e
|
Add who to contact for all staff facing messages
|
2013-02-13 19:28:30 -05: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 |
|
cahrens
|
4ae691e88a
|
Convert JSON that doesn't parse to String (unless object, array, or single quote).
|
2013-02-13 17:41:52 -05:00 |
|
Diana Huang
|
125e0b2137
|
Track the names of uploaded images, since we aren't recording
that data via the ajax calls.
|
2013-02-13 17:40:28 -05:00 |
|
Brian Talbot
|
d571c7791a
|
studio - resetting Unit UI HTML back to prev version for now
|
2013-02-13 17:01:45 -05:00 |
|
Brian Talbot
|
c250bc8b59
|
studio - page headers: setting up needed future CSS
|
2013-02-13 16:59:56 -05:00 |
|
Vik Paruchuri
|
1cc5e61507
|
More fixes on error messages
|
2013-02-13 16:52:09 -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 |
|
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 |
|