3127 Commits

Author	SHA1	Message	Date
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
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
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
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
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
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	9b6f8a3673	Merge pull request #1475 from MITx/feature/brian/pearson-exam ... change missingExamSeriesCode to missingPartnerID	2013-02-09 08:08:37 -08:00
Brian Wilson	2a1c89bec5	change missingExamSeriesCode to missingPartnerID	2013-02-09 02:24:51 -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
Brian Wilson	f51876da6a	cosmetic changes	2013-02-08 13:42:54 -05: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
Brian Wilson	ab6f383be1	support for Pearson test user	2013-02-08 03:05:28 -05:00
Brian Wilson	f1198b5f5f	for starting pearson exam, just call jump_to() instead of reverse(jump_to...)	2013-02-08 02:15:45 -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
Calen Pennington	2b637fe511	Fix loads of local static files when running in dev mode	2013-02-07 10:13:53 -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	18ddd1ee56	Merge pull request #1453 from MITx/victor/protex ... Victor/protex	2013-02-06 18:03:53 -08:00