Calen Pennington cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html

2014-05-22 10:52:00 -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

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

2014-05-22 10:52:00 -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

Updated tests for online help

2014-05-16 21:27:57 -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

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

2014-05-19 09:20:08 -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

help.feature

Updated tests for online help

2014-05-16 21:27:57 -04:00

help.py

Updated tests for online help

2014-05-16 21:27:57 -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

Acceptance tests for online help.

2014-05-16 20:38:09 -04: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

fix cms subsection tests

2014-05-20 13:42:51 +05:00

subsection.py

fix cms subsection tests

2014-05-20 13:42:51 +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

Fix acceptance tests.

2014-05-12 16:22:05 +03:00

transcripts.py

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

2014-05-12 11:35:03 -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

Merge pull request #3598 from edx/zoldak/rebalance-cms-shards

2014-05-14 11:29:31 -04:00

video_editor.py

Fix acceptance tests.

2014-05-12 16:22:05 +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 acceptance tests.

2014-05-12 16:22:05 +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