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

Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html

2014-05-16 14:01:20 -04:00

..

data

Convert between export formats.

2014-01-30 09:22:43 -05:00

rendering

Remove code related to Pearson Testing Centers

2013-11-26 17:04:19 -05:00

templates/test

Fixes LMS-1740 by activating the zooming diagram with the spacebar.

2014-04-01 10:12:21 -04:00

xml

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

2014-05-08 20:28:53 -04:00

__init__.py

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

2014-05-08 20:28:53 -04:00

helpers.py

Convert between export formats.

2014-01-30 09:22:43 -05:00

test_annotatable_module.py

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

2014-05-08 20:28:53 -04:00

test_capa_module.py

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

2014-05-08 20:28:53 -04:00

test_combined_open_ended.py

Fix failing tests

2014-05-12 14:45:38 -04:00

test_conditional_logic.py

fix-setattr-and-getattr

2013-09-13 14:44:49 -04:00

test_conditional.py

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

2014-05-08 20:28:53 -04:00

test_content.py

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

2014-05-08 20:28:53 -04:00

test_course_module.py

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

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

test_crowdsource_hinter.py

XModule datadog metrics

2014-04-03 18:31:44 +00:00

test_delay_between_attempts.py

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

2014-05-08 20:28:53 -04:00

test_editing_module.py

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

2014-05-08 20:28:53 -04:00

test_error_module.py

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

2014-05-08 20:28:53 -04:00

test_export.py

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

2014-05-08 20:28:53 -04:00

test_fields.py

Fix checking exception message.

2013-10-23 13:06:13 +03:00

test_graders.py

modify AssignmentFormatGrader to act like a SingleSectionGrader on single sections

2013-03-29 01:27:36 -04:00

test_html_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

test_import_static.py

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

2014-05-08 20:28:53 -04:00

test_import.py

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

2014-05-08 20:28:53 -04:00

test_lti20_unit.py

Fix failing tests

2014-05-12 14:45:38 -04:00

test_lti_unit.py

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

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

test_mako_module.py

Make XModuleDescriptor use __init__ from XBlock

2013-06-17 13:38:57 -04:00

test_peer_grading.py

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

2014-05-08 20:28:53 -04:00

test_poll.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

test_progress.py

Make XModuleDescriptor and XModule act as a single class

2013-10-08 15:29:17 -04:00

test_randomize_module.py

Remove unused imports from common, as reported by pylint.

2013-06-19 16:56:34 -04:00

test_resource_templates.py

Make problem types pluggable.

2014-01-22 21:33:24 -05:00

test_self_assessment.py

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

2014-05-08 20:28:53 -04:00

test_split_module.py

Fix split_test import and export.

2014-03-18 14:15:13 -04:00

test_stringify.py

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

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

test_tabs.py

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

2014-05-08 20:28:53 -04:00

test_textannotation.py

Revert pull request #3466

2014-05-14 13:55:26 -04:00

test_util_duedate.py

Add individual due dates feature.

2014-01-14 10:19:02 -05:00

test_util_open_ended.py

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

2014-05-08 20:28:53 -04:00

test_utils_django.py

Remove tabs.

2014-02-10 15:13:11 -05:00

test_video.py

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

2014-05-08 20:28:53 -04:00

test_videoannotation.py

Revert pull request #3466

2014-05-14 13:55:26 -04:00

test_word_cloud.py

Use XBlock handlers for handle_ajax in XModules

2013-11-08 11:08:48 -05:00

test_xblock_wrappers.py

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

2014-05-08 20:28:53 -04:00

test_xml_module.py

add max-attempts to inheritance.py (LMS-2130)

2014-05-12 15:55:15 -04:00