openassessment/xblock/test · 0dfc8fe6dd476c75919bd0007e319434d97db1c1 · edx / edx-ora2

Merge remote-tracking branch 'origin/master' into authoring · 0c026056

Conflicts:
	openassessment/xblock/static/css/openassessment.css
	openassessment/xblock/static/js/openassessment.min.js
	openassessment/xblock/static/js/src/oa_server.js
	openassessment/xblock/static/sass/oa/utilities/_developer.scss
	openassessment/xblock/student_training_mixin.py
	openassessment/xblock/test/data/invalid_rubric.xml
	openassessment/xblock/test/test_student_training.py
	openassessment/xblock/test/test_studio.py
	openassessment/xblock/test/test_xml.py
	openassessment/xblock/xml.py

committed Jul 14, 2014

0c026056

Name	Last commit	Last update
..
data		Loading commit data...
__init__.py		Loading commit data...
base.py		Loading commit data...
test_ai_grade.py		Loading commit data...
test_export_import.py		Loading commit data...
test_grade.py		Loading commit data...
test_lms.py		Loading commit data...
test_message.py		Loading commit data...
test_opaque_keys.py		Loading commit data...
test_openassessment.py		Loading commit data...
test_peer.py		Loading commit data...
test_resolve_dates.py		Loading commit data...
test_save_response.py		Loading commit data...
test_self.py		Loading commit data...
test_staff_info.py		Loading commit data...
test_student_training.py		Loading commit data...
test_studio.py		Loading commit data...
test_submission.py		Loading commit data...
test_validation.py		Loading commit data...
test_xml.py		Loading commit data...