4251 Commits

Author	SHA1	Message	Date
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
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
Arthur Barrett	949603e3c1	Fixed issue with return link and scroll after effects.	2013-02-13 01:16:20 -05:00
Arthur Barrett	6b5bf319c3	Style and behavior changes. Added return links to discussions.	2013-02-12 19:08:23 -05:00
Vik Paruchuri	b40a035ff7	Update error message	2013-02-12 15:32:57 -05:00
Vik Paruchuri	5cf7441da1	Fix error message passing to JS and student	2013-02-12 15:31:30 -05:00
Vik Paruchuri	53028b46c3	Remove debug statements	2013-02-12 15:23:11 -05:00
Vik Paruchuri	74b1187a39	Remove log statements	2013-02-12 15:04:49 -05:00
Vik Paruchuri	1409f8aa6b	Add in checking for score list length to rubric rendering	2013-02-12 15:03:03 -05:00
Vik Paruchuri	8d3f4932e7	Add in checks to see if student can submit (ie needs to peer grade more or not)	2013-02-12 14:41:36 -05:00
Vik Paruchuri	4237df625a	Add in a check function to see if students are allowed to submit peer grading	2013-02-12 14:31:30 -05:00
Arthur Barrett	0c70d201f8	Auto-expand the discussion thread after it is scrolled to by simulating a click on the show/hide button. Note: the jQuery highlight effect doesnt work here due to a CSS !important setting on .discussion-module background color.	2013-02-12 13:57:28 -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
Diana Huang	482d97d321	Better error messages for when a linked problem cannot be found	2013-02-12 13:41:26 -05:00
Vik Paruchuri	9ead4ebb35	Wire through ability to skip basic checks	2013-02-12 13:30:56 -05:00
Arthur Barrett	7e7911a08d	Changed the markup and js for associating spans with discussion threads. Uses the discussion id now.	2013-02-12 13:24:50 -05:00
Brian Wilson	b5378b04b3	change timer to calculate relative duration in javascript	2013-02-12 12:25:11 -05:00
Arthur Barrett	45a27f303f	Merge branch 'master' into feature/abarrett/annotatable_xmodule	2013-02-12 12:09:21 -05:00
Arthur Barrett	cfa16feab5	Trying to setup jasmine specs...	2013-02-12 12:00:54 -05:00
Diana Huang	d45c539c6d	Make the peer grading due date a property of the problem ... metadata, not the peer grading module metadata.	2013-02-12 10:49:06 -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
Vik Paruchuri	e1b2481c38	Fix remaining path issues	2013-02-11 19:08:53 -05:00
Vik Paruchuri	bdc5910cbb	Fix import paths to point to xmodule, remove old JS resource strings	2013-02-11 19:03:18 -05:00
Vik Paruchuri	b5bac1e3c1	Fix some path issues in import statements	2013-02-11 18:47:01 -05:00
Vik Paruchuri	b9bf96520e	Move open ended grading xmodule support files into a separate directory. apparently prune down on number of imports	2013-02-11 18:43:47 -05:00
Vik Paruchuri	c2b32b7038	Fix location that is queried on	2013-02-11 18:23:01 -05:00
Vik Paruchuri	ba650202b4	Add in logic to pass settings to peer grading xmodule	2013-02-11 18:09:57 -05:00