cahrens fae8fd3841 Merge branch 'master' into feature/christina/unify-fields ...

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_fields.py
	requirements/edx/github.txt

2013-06-13 10:55:13 -04:00

..

advanced-settings.feature

Test cleanup.

2013-06-13 10:42:23 -04:00

advanced-settings.py

Cannot set String field to a dict anymore!

2013-06-12 17:07:41 -04:00

checklists.feature

Skip tests that break on Ubuntu due to alerts (which will be removed

2013-05-15 09:39:07 -04:00

checklists.py

Fix lettuce tests

2013-05-23 12:50:19 -04:00

common.py

Add lettuce tests for single-click video creation and fix previously failing tests.

2013-06-03 10:20:38 -04:00

component_settings_editor_helpers.py

Unbreak acceptance tests in the cms.

2013-06-04 15:48:20 -04:00

course-settings.feature

Skip tests that break on Ubuntu due to alerts (which will be removed

2013-05-15 09:39:07 -04:00

course-settings.py

Fix lettuce tests

2013-05-23 12:50:19 -04:00

courses.feature

pep8 fixes

2013-03-26 11:44:57 -04:00

courses.py

Added tests for Limited Attempt Problems and Showing the Answer

2013-05-30 14:22:37 -04:00

discussion-editor.feature

Add tests for single-click discussion creation.

2013-06-03 14:57:34 -04:00

discussion-editor.py

Add tests for single-click discussion creation.

2013-06-03 14:57:34 -04:00

html-editor.feature

Selenium tests.

2013-05-23 11:34:02 -04:00

html-editor.py

Review feedback.

2013-05-30 14:13:10 -04:00

problem-editor.feature

Allow a value of 0 for max attempts. STUD-264.

2013-06-10 11:51:25 -04:00

problem-editor.py

Cannot set String field to a dict anymore!

2013-06-12 17:07:41 -04:00

section.feature

Changed wording to I will

2013-06-05 16:01:45 -04:00

section.py

Revert bad merge

2013-06-10 17:16:35 -04:00

signup.feature

Fix lettuce acceptance tests to reflect the new soft landing page changes.

2013-02-15 14:07:46 -05:00

signup.py

Fixed/skipped CMS tests in subsection and signup.

2013-05-15 10:14:37 -04:00

studio-overview-togglesection.feature

Changed wording to I will

2013-06-05 16:01:45 -04:00

studio-overview-togglesection.py

Added tests for Limited Attempt Problems and Showing the Answer

2013-05-30 14:22:37 -04:00

subsection.feature

Changed wording to I will

2013-06-05 16:01:45 -04:00

subsection.py

Refactor user factory usage for lettuce tests. Fix merge conflict.

2013-05-30 13:48:07 -04:00

video-editor.feature

Selenium tests.

2013-05-23 11:34:02 -04:00

video-editor.py

Prepare for Peter's change.

2013-05-30 14:30:28 -04:00

video.feature

Reword acceptance test.

2013-06-11 15:07:01 -04:00

video.py

Reword acceptance test.

2013-06-11 15:07:01 -04:00