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

1881 Commits

Author SHA1 Message Date
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
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
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
Chris Dodge
93d186511f clean up templates that were removed from disk - we need to remove from DB as well 2013-02-12 10:23:32 -05:00
Chris Dodge
33009eba7d add exporting of grading_policy.json 2013-02-11 14:30:26 -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
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
cc11dc2aa3 switch to using timelimit module for Pearson test 2013-02-07 15:57:43 -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
Victor Shnayder
edf96036c8 Merge remote-tracking branch 'origin/master' into 7012x-clean 2013-02-06 18:53:14 -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
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
Vik Paruchuri
733faebaf0 Fix git issue 2013-02-06 15:28:05 -05:00
Vik Paruchuri
5a51d142bb Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
 2013-02-06 15:26:01 -05:00
Vik Paruchuri
f568e49265 Fix oe version tests 2013-02-06 15:20:02 -05:00
Diana Huang
f42f84d9e8 Merge pull request #1440 from MITx/diana/rubric-ui-improvements 
Rubric UI updates
 2013-02-06 11:04:44 -08:00
Diana Huang
f3fa438018 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/timeparse.py
 2013-02-06 13:26:22 -05:00
Vik Paruchuri
f565d17b4f Merge branch 'feature/vik/oe-versioning' into fix/vik/peer-grading-images 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-02-06 13:23:31 -05:00
Vik Paruchuri
a0febd35a0 Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-02-06 13:22:12 -05:00
Vik Paruchuri
ddda9ba55d Try to fix tests 2013-02-06 13:19:37 -05:00
Diana Huang
4adf2f6180 Merge branch 'master' into diana/rubric-ui-improvements 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
 2013-02-06 13:16:24 -05:00