Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
10,180 Commits 1 Branch 0 Tags
2a05fdd4d9cf3ca1aa44fbc4cec06f05bf9be558
Commit Graph

10180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Carlos Andrés Rocha
dff0c10b7a Merge pull request #1493 from MITx/bug/dhm/misc 
Fix broken test and don't pass time units as strings but as ints.
 2013-02-12 15:14:37 -08:00
Don Mitchell
c904174bb7 Fix broken test and don't pass time units as strings but as ints. 2013-02-12 17:30:57 -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
chrisndodge
af364166fe Merge pull request #1491 from MITx/bug/dhm/misc 
lms required grace period fields to be in specific order
 2013-02-12 12:42:53 -08:00
Don Mitchell
76d675ba16 fix npe for time (bug 185) 2013-02-12 15:20:02 -05:00
Don Mitchell
8e213fb0d7 lms required grace period fields to be in specific order 2013-02-12 13:48:54 -05: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
David Ormsbee
e07b667c02 Merge pull request #1488 from MITx/bug/btalbot/pearson-ie 
Resolving an LMS sidebar accordion issue in IE7
 2013-02-12 08:01:59 -08: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
Brian Talbot
f33f7134fb lms - pearson: trying to resolve JQUI accordion width bug in IE7 - enforcing width to chapters 2013-02-12 10:34:21 -05:00
Calen Pennington
23bb87e0bb Merge pull request #1486 from MITx/feature/ned/clean_up_tests 
We no longer need override_settings, Django has a better one.
 2013-02-12 07:22:27 -08:00
Calen Pennington
de5b3a2a39 Merge pull request #1483 from MITx/feature/victor/raw-static-files 
Feature/victor/raw static files
 2013-02-12 07:21:01 -08:00
Brian Talbot
83e4dfaacb lms - pearson: trying to resolve JQUI accordion width bug in IE7 2013-02-12 09:58:16 -05:00
Kevin Chugh
21f4616080 spread less than and greater than fix to responses and comments, and profile view 2013-02-12 09:18:46 -05:00
Kevin Chugh
d57c78f9d9 fix showing less than and greater than in code 2013-02-11 20:01:09 -05:00
Victor Shnayder
3ccb33c8b3 Simplify, make it actually work. 
- regexp was too complicated, didn't work
 2013-02-11 17:50:13 -05:00
Victor Shnayder
2dcdeff4b6 Make replace_static_urls leave alone urls that have '?raw' at the end 
- needed for GWT'ed modules that rely on the filename to find dependencies
 2013-02-11 17:07:15 -05:00
Ned Batchelder
aa2d0ecaf2 We no longer need override_settings, Django has a better one. 2013-02-11 17:06:35 -05:00
Christina Roberts
f18618e35b Merge pull request #1482 from MITx/bug/dhm/misc 
bug 155
 2013-02-11 13:46:20 -08:00
Don Mitchell
8bc9564d92 clean up note to self 2013-02-11 16:45:36 -05:00
Don Mitchell
777e0ef9c5 The other one was too inclusive 2013-02-11 16:36:34 -05:00
Don Mitchell
565f5f0adc Stop simple clicks from paging to top w/o disrupting dnd 2013-02-11 16:28:22 -05:00
Christina Roberts
14234c8106 Merge pull request #1481 from MITx/bug/dhm/misc 
Bug 180
 2013-02-11 13:23:08 -08:00
Don Mitchell
46a7f7427a Merge pull request #1479 from MITx/fix/cdodge/export-include-grading-policy 
add exporting of grading_policy.json
 2013-02-11 12:53:36 -08:00
Don Mitchell
ae4a854e18 Bug 180 2013-02-11 15:46:58 -05:00
David Ormsbee
75ff2bd6cb Merge pull request #1456 from MITx/fix/cdodge/dangling-discussion-modules 
Fix/cdodge/dangling discussion modules
 2013-02-11 11:40:00 -08:00
Chris Dodge
33009eba7d add exporting of grading_policy.json 2013-02-11 14:30:26 -05:00