Calen Pennington 155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master ...

Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py

2014-05-09 15:29:32 -04:00

..

stubs

lti 2.0 result service rest endpoint

2014-04-29 12:01:12 -07:00

__init__.py

Moved stub servers to terrain

2013-12-19 09:12:41 -05:00

browser.py

Tweaking automatic screenshots in acceptance tests.

2014-04-09 11:37:32 +03:00

course_helpers.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-06 10:08:32 -04:00

factories.py

Don't create more factory subclasses, just absorb the classes directly

2013-12-20 12:32:14 -05:00

start_stubs.py

Configure youtube stub for bok-choy

2014-04-25 20:01:09 +00:00

steps.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-06 10:08:32 -04:00

ui_helpers.py

Fix pylint disable pragmas that were pep8 violations

2014-03-20 10:18:40 -04:00