Commits · 00d6a0e5021c5405e7aa3c4718fb92d89e524858 · edx / edx-ora2

01 Aug, 2014 11 commits
- 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
```
  Will Daly committed Aug 01, 2014
  00d6a0e5 Browse Files
- Refactor integer field validation · f7492b20
```
Add field validation for peer assessment must grade and must be graded by.
```
  Will Daly committed Aug 01, 2014
  f7492b20 Browse Files
- Change validation highlighting to use a border instead of a color · 659d1677
  Will Daly committed Aug 01, 2014
  
  659d1677 Browse Files
- Merge pull request #568 from edx/grady/safari-blue-tabs · f76313c7
```
Attempted to fix safari blue tab issue
```
  gradyward committed Aug 01, 2014
  f76313c7 Browse Files
- Fixup: datetime field regression · ff7bd5fc
  Will Daly committed Aug 01, 2014
  
  ff7bd5fc Browse Files
- Fixup for template test case: ensure peer assessment has a date · fef17a4a
  Will Daly committed Aug 01, 2014
  
  fef17a4a Browse Files
- Ensure that all validation errors are marked. · 5a0070ee
  Will Daly committed Aug 01, 2014
  
  5a0070ee Browse Files
- Hide validation alert after validation is complete instead of before · f1f91671
  Will Daly committed Aug 01, 2014
  
  f1f91671 Browse Files
- Make highlight field class less specific · 812d472e
  Will Daly committed Aug 01, 2014
  
  812d472e Browse Files
- Attempted to fix safari blue tab issue · 608feb22
  gradyward committed Aug 01, 2014
  
  608feb22 Browse Files
- Merge pull request #565 from edx/grady/validation-sassafrass · 023d9f91
```
Animations!
```
  Will Daly committed Aug 01, 2014
  023d9f91 Browse Files
31 Jul, 2014 7 commits
- Added in animations · f1699ccf
  gradyward committed Jul 31, 2014
  
  f1699ccf Browse Files
- Merge pull request #559 from edx/will/ora-735 · 969c734a
```
Add maxlength attribute to authoring editor textareas
```
  Will Daly committed Jul 31, 2014
  969c734a Browse Files
- Broadens the scope of the validation alert, and adjusts the editor height based on the alert height · d1154015
```
Conflicts:
	openassessment/xblock/static/js/openassessment-studio.min.js
```
  gradyward committed Jul 31, 2014
  d1154015 Browse Files
- Add maxlength attribute to authoring editor textareas · 0ea260d4
  Will Daly committed Jul 31, 2014
  
  0ea260d4 Browse Files
- Merge pull request #558 from edx/will/fix-html-errors · 2cae6d61
```
Fix some HTML issues in the templates
```
  Will Daly committed Jul 31, 2014
  2cae6d61 Browse Files
- Fix some HTML issues in the templates · ed615f07
  Will Daly committed Jul 31, 2014
  
  ed615f07 Browse Files
- Add field validation for datetime fields and option points. · a5921b62
```
Remove support in Javascript for "default" (empty) dates and update the template rendering script to support this in the JS tests.
```
  Will Daly committed Jul 31, 2014
  a5921b62 Browse Files
30 Jul, 2014 12 commits
- Merge pull request #555 from edx/grady/ORA-729 · 88c93ae4
```
Fixed ORA-740
```
  Stephen Sanchez committed Jul 30, 2014
  88c93ae4 Browse Files
- Fixed ORA-740 · 7993f76d
  gradyward committed Jul 30, 2014
  
  7993f76d Browse Files
- Merge pull request #553 from edx/sanchez/fix-multi-event-firing · a2e32218
```
Making event listener registering explicit for containers
```
  Stephen Sanchez committed Jul 30, 2014
  a2e32218 Browse Files
- Making event listener registering explicit for containers · 434f93ac
  Stephen Sanchez committed Jul 30, 2014
  
  434f93ac Browse Files
- Merge pull request #550 from edx/grady/ORA-738 · 8bed9618
```
Fixed a wide screen error where the rubric would not display properly
```
  gradyward committed Jul 30, 2014
  8bed9618 Browse Files
- Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/ORA-738 · e088432b
```
Conflicts:
	openassessment/xblock/static/css/openassessment.css
```
  gradyward committed Jul 30, 2014
  e088432b Browse Files
- Merge pull request #552 from edx/grady/ORA-689 · f788986f
```
Fixes the translation of the Option Points display in Student Training Examples Authoring
```
  gradyward committed Jul 30, 2014
  f788986f Browse Files
- Merge pull request #547 from edx/sanchez/fix-display-block · b8cd6294
```
Change the display to block for cross browser (IE) support
```
  Stephen Sanchez committed Jul 30, 2014
  b8cd6294 Browse Files
- Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/ORA-689 · 75b5d5af
```
Conflicts:
	openassessment/xblock/static/js/openassessment-lms.min.js
	openassessment/xblock/static/js/openassessment-studio.min.js
	openassessment/xblock/static/js/src/oa_shared.js
```
  gradyward committed Jul 30, 2014
  75b5d5af Browse Files
- Change the display to block for cross browser (IE) support · 2170d2f3
  Stephen Sanchez committed Jul 30, 2014
  
  2170d2f3 Browse Files
- Fixes the translation of the Option Points display in Student Training Examples Authoring · 1d7424ed
  gradyward committed Jul 30, 2014
  
  1d7424ed Browse Files
- Merge remote-tracking branch 'origin/master' into authoring · cb932343
```
Conflicts:
	Makefile
	openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html
	openassessment/templates/openassessmentblock/self/oa_self_assessment.html
	openassessment/xblock/data_conversion.py
	openassessment/xblock/grade_mixin.py
	openassessment/xblock/peer_assessment_mixin.py
	openassessment/xblock/self_assessment_mixin.py
	openassessment/xblock/static/css/openassessment.css
	openassessment/xblock/static/js/src/oa_server.js
	openassessment/xblock/studio_mixin.py
	openassessment/xblock/xml.py
```
  Will Daly committed Jul 30, 2014
  cb932343 Browse Files
29 Jul, 2014 10 commits
- Merge pull request #551 from edx/will/render-example-based-editor · 7b55559d
```
Bugfix: show example-based assessment in the authoring GUI
```
  Will Daly committed Jul 29, 2014
  7b55559d Browse Files
- Merge pull request #549 from edx/will/datepicker-hidden-bug · b236715f
```
Do not change the z-index of the modal window
```
  Will Daly committed Jul 29, 2014
  b236715f Browse Files
- Fix a bug that caused example-based assessments to stop being displayed in the authoring GUI. · aa092fa3
  Will Daly committed Jul 29, 2014
  
  aa092fa3 Browse Files
- Fixed a wide screen error where the rubric would not display properly · 07115ec3
  gradyward committed Jul 29, 2014
  
  07115ec3 Browse Files
- Do not change the z-index of the modal window · 62ae613e
  Will Daly committed Jul 29, 2014
  
  62ae613e Browse Files
- Merge pull request #539 from edx/will/generate-events-for-ora · 49280183
```
Add event tracking for student training and image upload
```
  Will Daly committed Jul 29, 2014
  49280183 Browse Files
- Merge pull request #546 from edx/grady/fix-alert · 49d9213f
```
Fixed the behavior of the alert
```
  gradyward committed Jul 29, 2014
  49d9213f Browse Files
- Merge pull request #474 from edx/sylvia/docs/ORA-43 · 0e79014f
```
Add information about uploading an image in a response
```
  srpearce committed Jul 29, 2014
  0e79014f Browse Files
- Add information about uploading an image in a response · 9436c029
  Sylvia Pearce committed Jul 29, 2014
  
  9436c029 Browse Files
- Merge pull request #544 from edx/will/minimize-should-be-minify · 1fac6604
```
Clarify naming of Javascript minify task
```
  Will Daly committed Jul 29, 2014
  1fac6604 Browse Files