apps/openassessment/xblock/test · 53d095abd4a647efd2ac416005fc29485a65dab0 · edx / edx-ora2

Merge branch 'master' into ai-grading · ac4251dd

Conflicts:
	apps/openassessment/xblock/static/js/fixtures/templates.json
	apps/openassessment/xblock/static/js/openassessment.min.js
	apps/openassessment/xblock/static/js/spec/oa_staff_info.js

committed May 23, 2014

ac4251dd

Name	Last commit	Last update
..
data		Loading commit data...
__init__.py		Loading commit data...
base.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...