openassessment/xblock · 00d6a0e5021c5405e7aa3c4718fb92d89e524858 · edx / edx-ora2

Merge remote-tracking branch 'origin/authoring' into will/js-field-validation · 00d6a0e5

Conflicts:
	openassessment/xblock/static/css/openassessment.css
	openassessment/xblock/static/js/openassessment-studio.min.js
	openassessment/xblock/static/js/src/studio/oa_container_item.js
	openassessment/xblock/static/js/src/studio/oa_edit_rubric.js
	openassessment/xblock/static/sass/oa/utilities/_developer.scss

committed Aug 01, 2014

00d6a0e5

Name	Last commit	Last update
..
static		Loading commit data...
test		Loading commit data...
__init__.py		Loading commit data...
data_conversion.py		Loading commit data...
defaults.py		Loading commit data...
grade_mixin.py		Loading commit data...
lms_mixin.py		Loading commit data...
message_mixin.py		Loading commit data...
openassessmentblock.py		Loading commit data...
peer_assessment_mixin.py		Loading commit data...
resolve_dates.py		Loading commit data...
schema.py		Loading commit data...
self_assessment_mixin.py		Loading commit data...
staff_info_mixin.py		Loading commit data...
student_training_mixin.py		Loading commit data...
studio_mixin.py		Loading commit data...
submission_mixin.py		Loading commit data...
validation.py		Loading commit data...
workflow_mixin.py		Loading commit data...
xml.py		Loading commit data...