Adam Palay 4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29 ...

Conflicts:
	requirements/edx/github.txt

2015-06-29 16:55:57 -04:00

..

__init__.py

Add Video Bumper.

2015-05-31 14:45:31 +03:00

bumper_utils.py

Add Video Bumper.

2015-05-31 14:45:31 +03:00

transcripts_utils.py

transcript name param url

2015-06-09 20:04:16 +05:00

video_handlers.py

Video module support for student_view_json.

2015-06-12 09:27:17 -04:00

video_module.py

Merge remote-tracking branch 'origin/release' into rc/2015-06-29

2015-06-29 16:55:57 -04:00

video_utils.py

Add Video Bumper.

2015-05-31 14:45:31 +03:00

video_xfields.py

Fix XBlock inheritance ordering. XBlockMixin and derivatives should always come after XBlock and derivatives

2015-06-26 11:05:38 -04:00