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

Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html

2014-05-13 15:30:56 -04:00

..

annotatable.feature

i18n for self-assessment (ORA-314)

2014-02-14 17:27:32 -05:00

annotatable.py

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

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

certificates.feature

Remove dot from a scenario name so the results roll up in Jenkins

2013-12-16 17:07:26 -05:00

certificates.py

Add the "VERIFIED_CERTIFICATES" toggle on dashboard

2014-05-05 20:10:26 +05:00

common.py

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

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

conditional.feature

Add acceptance tests of the conditional module [LMS-1639]

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

conditional.py

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

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

courseware_common.py

Change URL patterns for instructor dashboard

2014-05-12 10:18:28 -04:00

courseware.py

Fix pylint disable pragmas that were pep8 violations

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

events.feature

add acceptance tests for event tracking

2013-10-09 08:09:14 -04:00

events.py

Integrate event-tracking in to the LMS

2014-05-01 14:04:35 -04:00

gst.feature

Add acceptance test of the Graphical Slider Tool [LMS-1641]

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

gst.py

Add acceptance test of the Graphical Slider Tool [LMS-1641]

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

help.feature

Namespace the acceptance tests so they show up nicely in jenkins

2013-09-24 14:35:12 -04:00

help.py

Fix pylint disable pragmas that were pep8 violations

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

high-level-tabs.feature

Added more descriptive page titles.

2014-01-30 17:32:03 -05:00

high-level-tabs.py

Disable pylint violation E0611 when importing assert_* methods from nose.tools

2013-08-27 16:21:33 -04:00

homepage.feature

Remove references to old university images

2014-01-14 09:27:03 -05:00

homepage.py

Fix pylint disable pragmas that were pep8 violations

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

login.feature

Namespace the acceptance tests so they show up nicely in jenkins

2013-09-24 14:35:12 -04:00

login.py

Fix pylint disable pragmas that were pep8 violations

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

lti.feature

Change URL patterns for instructor dashboard

2014-05-12 10:18:28 -04:00

lti.py

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

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

navigation.feature

Fixed navigation acceptance test

2013-10-21 10:31:27 -04:00

navigation.py

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

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

openended.feature

Namespace the acceptance tests so they show up nicely in jenkins

2013-09-24 14:35:12 -04:00

openended.py

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

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

problems_setup.py

Fix pylint disable pragmas that were pep8 violations

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

problems.feature

Answer checks should offer feedback to assistive tech. This commit adds

2014-03-20 09:53:44 -04:00

problems.py

Removed inappropriate section tags. Because screen readers announce each section, they should not be used unless they are actually defining meaningful sections.

2014-02-05 11:32:08 -05:00

registration.feature

emit enrollment event

2013-11-06 15:09:33 -05:00

registration.py

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

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

signup.feature

Namespace the acceptance tests so they show up nicely in jenkins

2013-09-24 14:35:12 -04:00

signup.py

Fix pylint disable pragmas that were pep8 violations

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

video.feature

Bok-Choy Video Tests Batch6

2014-05-09 07:22:03 +00:00

video.py

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

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

word_cloud.feature

Namespace the acceptance tests so they show up nicely in jenkins

2013-09-24 14:35:12 -04:00

word_cloud.py

Fix pylint disable pragmas that were pep8 violations

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