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

2470 Commits

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
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
Brian Wilson
b5378b04b3 change timer to calculate relative duration in javascript 2013-02-12 12:25:11 -05: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
Chris Dodge
33009eba7d add exporting of grading_policy.json 2013-02-11 14:30:26 -05:00
David Ormsbee
fb1e7f3dc1 Make type check for self.code a little more robust, give default val for mmlans so it's never undefined 2013-02-10 19:03:25 -05:00
David Ormsbee
80843c1561 Merge pull request #1463 from MITx/feature/brian/pearson-exam 
Feature/brian/pearson exam
 2013-02-08 11:07:15 -08:00
cahrens
98026e4325 A couple minor bug fixes. 
https://edx.lighthouseapp.com/projects/102637/tickets/173
https://edx.lighthouseapp.com/projects/102637/tickets/177
 2013-02-08 12:46:32 -05:00
Jay Zoldak
0d0049ec76 Merge pull request #1465 from MITx/feature/ichuang/fix-test-conditional 
fix test_conditional
 2013-02-08 08:13:01 -08:00
Calen Pennington
dd4db0601f Remove generated files 2013-02-08 10:45:59 -05:00
ichuang
7b7b0690b6 fix test_conditional 2013-02-07 18:19:48 -05:00
Brian Wilson
290368ef0d merge out from master 2013-02-07 17:40:54 -05:00
Brian Wilson
80e4944314 minor cleanup 2013-02-07 16:12:02 -05:00
Brian Wilson
2974b9eec3 Merge branch 'feature/brian/pearson-exam' of github.com:MITx/mitx into feature/brian/pearson-exam 2013-02-07 15:58:12 -05:00
Brian Wilson
cc11dc2aa3 switch to using timelimit module for Pearson test 2013-02-07 15:57:43 -05:00
Julian Arni
8a75e1ad19 Added comment 2013-02-07 14:50:18 -05:00
Brian Talbot
6d4cb558d3 lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav 2013-02-07 12:35:52 -05:00
Brian Wilson
33a5a5fd9f add implementation for fixed_time_module 2013-02-07 05:17:56 -05:00
Victor Shnayder
37b735d708 Merge pull request #1454 from MITx/hotfix/dave/youtube_object 
Hack to disable YouTube <iframe> API when they break it.
 2013-02-06 19:41:12 -08:00
David Ormsbee
a470a62d12 Hack to disable YouTube <iframe> API when they break it. 2013-02-06 22:37:41 -05:00
Julian Arni
a770e34bec Adding multiple-choice loncapa integration. 2013-02-06 20:54:43 -05:00
jmclaus
5737f58b95 Added GWT Protex - reads target shape from xml writes answer to hidden input field 2013-02-06 20:48:25 -05:00
Victor Shnayder
0141f31d33 add warning message to sample-post.py 2013-02-06 18:57:25 -05:00
Victor Shnayder
edf96036c8 Merge remote-tracking branch 'origin/master' into 7012x-clean 2013-02-06 18:53:14 -05:00
Carlos Andrés Rocha
536333cbb5 Refactor how editamolecule displays messages 2013-02-06 18:31:00 -05:00
ichuang
b5ba88f0af Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker 
Conflicts:
	common/lib/xmodule/xmodule/conditional_module.py
 2013-02-06 18:15:36 -05:00
ichuang
c16f688802 conditional xmod: add errortracker msg and inherit icon from child 2013-02-06 18:10:25 -05:00
Carlos Andrés Rocha
d4afa02b12 Modify editamolecule to load GWT scripts dynamically 2013-02-06 17:40:44 -05:00
David Ormsbee
e5fda33eff Throw the error back up if we don't have a console to log it to. 2013-02-06 17:13:22 -05:00
Vik Paruchuri
463f31618d Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images 2013-02-06 16:37:52 -05:00
Vik Paruchuri
cf81fb27e8 Add in close date to metadata 2013-02-06 15:55:39 -05:00