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

..

advanced_settings.feature

Enable latex problems via key in course.settings.

2013-11-04 12:13:23 +02:00

advanced_settings.py

Fix pylint disable pragmas that were pep8 violations

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

checklists.feature

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00

checklists.py

Fix pylint disable pragmas that were pep8 violations

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

common.py

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

2014-05-07 12:56:43 -04:00

component_settings_editor_helpers.py

Remove feature flag for testing on container pages

2014-04-09 13:52:21 -04:00

component.feature

Tests for raw editor and minor wording changes.

2014-04-24 14:18:13 -04:00

component.py

Tests for raw editor and minor wording changes.

2014-04-24 14:18:13 -04:00

course_import.py

pep8 and pylint fixes

2013-10-16 15:03:14 -04:00

course-export.feature

Add acceptance test for behavior when & is in problem xml.

2013-12-30 15:08:53 -05:00

course-export.py

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

2014-05-07 12:56:43 -04:00

course-overview.feature

refactor studio component creation in acceptance tests

2013-10-16 15:02:49 -04:00

course-overview.py

Wait for non-blank link in course-overview test

2013-10-15 21:21:09 -04:00

course-settings.feature

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00

course-settings.py

Fix pylint disable pragmas that were pep8 violations

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

course-team.feature

enable tests depending on assert is_css_present(css_selector)

2014-01-17 21:11:17 +05:00

course-team.py

Fix pylint disable pragmas that were pep8 violations

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

course-updates.feature

Show error on invalid html in course handout edit + Added tests

2013-11-20 17:33:07 +05:00

course-updates.py

Fix pylint disable pragmas that were pep8 violations

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

courses.feature

Namespace the acceptance tests so they show up nicely in jenkins

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

courses.py

Fix pylint disable pragmas that were pep8 violations

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

discussion-editor.feature

Rebuild the way modals are constructed to support nesting.

2014-04-09 10:32:13 -04:00

discussion-editor.py

Rebuild the way modals are constructed to support nesting.

2014-04-09 10:32:13 -04:00

grading.feature

Acceptance test for fixing rounding error on weight.

2013-10-10 12:02:21 -04:00

grading.py

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

2014-05-07 12:56:43 -04:00

html-editor.feature

Tests for raw editor and minor wording changes.

2014-04-24 14:18:13 -04:00

html-editor.py

Tests for raw editor and minor wording changes.

2014-04-24 14:18:13 -04:00

pages.feature

Support for "View Live" on Pages page.

2014-03-28 05:41:32 -04:00

pages.py

Disable discussion service setting for lettuce tests

2014-04-10 11:51:20 -04:00

problem-editor.feature

Fixed toggle cheatsheet not working on component editors.

2014-04-23 11:08:12 +05:00

problem-editor.py

Fixed toggle cheatsheet not working on component editors.

2014-04-23 11:08:12 +05:00

section.feature

Namespace the acceptance tests so they show up nicely in jenkins

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

section.py

studio outline test fixes

2013-12-09 15:21:57 -05:00

signup.feature

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

2014-05-07 12:56:43 -04:00

signup.py

Fix pylint disable pragmas that were pep8 violations

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

subsection.feature

save dates on enter key press

2014-04-09 13:02:11 +05:00

subsection.py

save dates on enter key press

2014-04-09 13:02:11 +05:00

textbooks.feature

Switch PDF Textbooks to use portable URLs

2014-04-16 13:05:25 -04:00

textbooks.py

Add multiple transcripts editor.

2014-03-31 18:49:56 +03:00

transcripts.feature

Add multiple transcripts editor.

2014-03-31 18:49:56 +03:00

transcripts.py

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

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

upload.feature

Rebalance acceptance test shards

2013-12-19 10:41:45 -05:00

upload.py

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

2014-05-07 12:56:43 -04:00

video_editor.feature

BLD-1000: Download handout.

2014-04-22 21:44:36 +03:00

video_editor.py

BLD-1000: Download handout.

2014-04-22 21:44:36 +03:00

video_handout.feature

BLD-1000: Download handout.

2014-04-22 21:44:36 +03:00

video_handout.py

BLD-1000: Download handout.

2014-04-22 21:44:36 +03:00

video.feature

Fix flaky video tests: speed up youtube api loading and wait for controls.

2014-04-03 14:37:17 +03:00

video.py

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

2014-05-07 12:56:43 -04:00