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
27045de758
adding jquery.tabs file missing previously
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
John Hess
259bd8817f
Moved onclick to 'fold' button instead of to courseware's button
2013-02-13 15:10:32 -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
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
Brian Talbot
f1ad05059c
studio - correcting an image-replacement Sass mixin
2013-02-13 09:18:23 -05: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
jmclaus
9dbe911907
Back to last version of Protex
2013-02-13 09:45:44 +01: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
Valera Rozuvan
78e9692aaa
Adding HTML5Video class and modifying coffee sources to use it when video sources are provided instead of YouTube IDs.
2013-02-13 10:27:56 +02:00
Valera Rozuvan
156da20c35
Renamed videox to videoalpha, as per Piotr naming scheme request.
2013-02-13 10:27:55 +02:00
Julian Arni
9785bc9e70
Adding multiple-choice loncapa integration.
2013-02-12 17:21:34 -05:00
Don Mitchell
d569c559ca
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
...
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/views/settings/main_settings_view.js
cms/templates/index.html
cms/templates/settings.html
2013-02-12 16:57:00 -05:00
jkarni
2197bd987f
Merge pull request #1461 from MITx/feature/julian/multiple-choice-tweaks
...
Feature/julian/multiple choice tweaks
2013-02-12 13:32:15 -08:00
Ned Batchelder
27e8d699be
On 32-bit Python, this conversion could overflow, for example, for year 2099. This conversion won't.
2013-02-12 13:43:03 -05:00
David Ormsbee
537d6dd18e
Merge pull request #1490 from MITx/bugfix/brian/pearson-timer
...
change timer to calculate relative duration in javascript
2013-02-12 09:26:53 -08:00
Brian Wilson
b5378b04b3
change timer to calculate relative duration in javascript
2013-02-12 12:25:11 -05:00
Ned Batchelder
baee9f96dc
Merge branch 'master' of github.com:MITx/mitx
2013-02-12 11:28:51 -05:00
Ned Batchelder
78d3d20069
When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons.
...
Conflicts:
common/djangoapps/util/converters.py
2013-02-12 11:25:14 -05:00
Victor Shnayder
7d65c64148
Merge pull request #1485 from MITx/fix/kevin/code_show_lt_and_gt
...
fix showing less than and greater than in code
2013-02-12 07:38:16 -08:00
