Adam Palay 76fc180cd9 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	common/lib/xmodule/xmodule/css/capa/display.scss

2015-09-01 16:01:04 -04:00

..

data

Delete mention of direction from checkboxgroup.

2015-07-24 14:44:08 -04:00

discussion

Add signals for user's discussion activity.

2015-08-26 12:07:54 -04:00

lms

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2015-09-01 16:01:04 -04:00

studio

(SOL-1160) mark test as flaky

2015-09-01 12:26:50 +00:00

video

fetch transcript for html5 with youtubeId if 404

2015-08-27 08:04:57 -07:00

__init__.py

Quiet stevedore.extension logging in bok-choy tests

2014-10-01 12:14:51 -04:00

helpers.py

Change imports from path to use the stablest name.

2015-08-27 12:59:25 -04:00

test_annotatable.py

Eliminate instances of unused-import Pylint violation

2015-07-13 17:33:25 -04:00

test_cohorted_courseware.py

Revert "Decorated instructor dashboard with sudo_required."

2015-07-17 12:11:38 -04:00

test_ora.py

Fix PEP8: E128 continuation line under-indented

2014-11-24 20:46:50 -05:00