Adam Palay 76fc180cd9 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	common/lib/xmodule/xmodule/css/capa/display.scss

2015-09-01 16:01:04 -04:00

..

test_files

Adresses TNL-3096

2015-08-27 15:50:33 +00:00

__init__.py

Extended Feedback and Hints for Problems

2015-06-17 16:25:04 -07:00

response_xml_factory.py

Revert "OSPR-535 Partial Credit"

2015-09-01 14:04:42 -04:00

test_answer_pool.py

Temporarily disable capa name masking

2014-05-29 22:12:43 -07:00

test_correctmap.py

Revert "OSPR-535 Partial Credit"

2015-09-01 14:04:42 -04:00

test_customrender.py

Fixing pep8 issues

2014-12-11 13:04:49 -05:00

test_hint_functionality.py

Adresses TNL-3096

2015-08-27 15:50:33 +00:00

test_html_render.py

Revert "Fieldset and legend solution is lost when edit Problem"

2015-05-29 18:50:34 -04:00

test_input_templates.py

Fixes tests, adds internationalized strings for new state tooltips, corrected tooltip javascript, etc.

2015-06-23 10:27:22 -04:00

test_inputtypes.py

fix quality violation

2015-05-29 21:46:02 -04:00

test_responsetypes.py

Revert "OSPR-535 Partial Credit"

2015-09-01 14:04:42 -04:00

test_shuffle.py

Temporarily disable capa name masking

2014-05-29 22:12:43 -07:00

test_targeted_feedback.py

Temporarily disable capa name masking

2014-05-29 22:12:43 -07:00

test_util.py

Adresses TNL-3096

2015-08-27 15:50:33 +00:00