Christina Roberts
94a28f600b
Merge pull request #1510 from MITx/bug/btalbot/html-strongspan
...
xmodule scss - resolved studio bug #191
2013-02-19 09:09:47 -08:00
VikParuchuri
0db6247d96
Merge pull request #1513 from MITx/feature/vik/improve-oe-ui
...
Skip self assessment test (fails due to need for querydict for getlist t...
2013-02-19 08:15:42 -08:00
Vik Paruchuri
9ee956a397
Skip self assessment test (fails due to need for querydict for getlist to work, but mocking querydict is painful)
2013-02-19 11:05:43 -05:00
Diana Huang
f4addddf42
Merge pull request #1484 from MITx/feature/vik/improve-oe-ui
...
Feature/vik/improve oe ui
2013-02-19 07:27:29 -08:00
Brian Talbot
6d2ada5084
xmodule scss - resolved some general span styling that would override basic em or strong type styling
2013-02-19 09:59:36 -05:00
Christina Roberts
dceb8fee5e
Merge pull request #1494 from MITx/feature/marco/addcomponent
...
Feature/marco/addcomponent
2013-02-15 10:13:24 -08:00
Valera Rozuvan
c7679ea624
Removed debugging comments.
2013-02-15 18:12:53 +02:00
Valera Rozuvan
a0f46dae49
Fixed bug that prevented Firefox from playing HTML5 video content.
2013-02-15 18:10:14 +02:00
Don Mitchell
bfcc0559a7
Merge pull request #1503 from MITx/fix/cdodge/export-policy-json
...
add exporting of policy.json
2013-02-14 12:47:37 -08:00
Chris Dodge
ea068d4aa8
add exporting of policy.json
2013-02-14 14:19:38 -05:00
Victor Shnayder
1108137dc3
Address Cale's comment--make property a simple class var
2013-02-14 13:24:21 -05:00
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
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
marco
5a283127a4
clean up based on cahrens pull requests notes
2013-02-13 16:41:43 -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
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
