Adam Palay 8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master ...

Conflicts:
	common/test/acceptance/tests/video/test_video_times.py

2015-05-08 10:23:04 -04:00

..

__init__.py

Bok-Choy Tests for Video Start Time, End Time and Finish Time

2014-05-27 10:37:26 +00:00

test_studio_video_editor.py

Add Simplified and Traditional Chinese as Transcript language options

2015-04-15 15:38:42 +05:00

test_studio_video_module.py

Add bok-choy shards 4 and 5. When no shard is specified on a test, it

2015-04-30 17:34:24 -04:00

test_studio_video_transcript.py

TNL-1299: Update default video.

2015-02-05 10:55:36 +02:00

test_video_events.py

Make user_track use eventtracking

2015-05-06 20:57:46 -04:00

test_video_handout.py

Add bok-choy shards 4 and 5. When no shard is specified on a test, it

2015-04-30 17:34:24 -04:00

test_video_module.py

Make user_track use eventtracking

2015-05-06 20:57:46 -04:00

test_video_times.py

skip failing test

2015-05-07 14:34:44 -04:00