Commits · a2e3221855e6dd9ebca5c0c646f8944a27a14140 · edx / edx-ora2

30 Jul, 2014 10 commits
- 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 12 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
- Attempted to fix the behavior of the alert · b991aee7
  gradyward committed Jul 29, 2014
  
  b991aee7 Browse Files
- Clarify naming of Javascript minify task · a3e18a30
  Will Daly committed Jul 29, 2014
  
  a3e18a30 Browse Files
28 Jul, 2014 17 commits
- Add event tracking for student training and image upload · cbaba5aa
  Will Daly committed Jul 28, 2014
  
  cbaba5aa Browse Files
- Merge pull request #541 from edx/will/update-dev-docs · c80d9141
```
Update developer docs
```
  Will Daly committed Jul 28, 2014
  c80d9141 Browse Files
- Changed the Student Training Example Authoring Interface to correctly use "Point" vs "Points" · feb155b0
  gradyward committed Jul 28, 2014
  
  feb155b0 Browse Files
- Add file upload API to developer docs · 34bd68c3
```
Point setup instructions to the README

Add instructions for combining/minifying static assets

Update workflow overview architecture docs

Update AI grading architecture docs

Use napoleon keyword argument instead of kwargs

Fix example usage docstrings in AI API
```
  Will Daly committed Jul 28, 2014
  34bd68c3 Browse Files
- Merge pull request #532 from edx/will/grady/self-assessment-feedback · 45c53fba
```
Will/grady/self assessment feedback
```
  gradyward committed Jul 28, 2014
  45c53fba Browse Files
- Addressed code review comments · d6012733
  gradyward committed Jul 28, 2014
  
  d6012733 Browse Files
- Merge pull request #536 from edx/sanchez/validation-alerts · bde2b6e6
```
Updating the alerts in the rubric authoring.
```
  Stephen Sanchez committed Jul 28, 2014
  bde2b6e6 Browse Files
- Updating the alerts in the rubric authoring. · 6a630378
  Stephen Sanchez committed Jul 28, 2014
  
  6a630378 Browse Files
- Merge pull request #538 from edx/will/student-training-refactor-and-tests · 6a28da14
```
Student training dynamic update refactor and tests
```
  Will Daly committed Jul 28, 2014
  6a28da14 Browse Files
- Add tests for dynamic update of student training examples based on rubric changes. · 2232813d
```
Use dependency injection for event notification; moved some classes around.
Move the container JS classes into the Studio minified JS.
Fix a bug that broke student training updates in Firefox and PhantomJS.
Move fixture path installation into a common file shared by all tests.

Add tests that verify the correct notifications
are sent by the rubric view.
```
  Will Daly committed Jul 28, 2014
  2232813d Browse Files
- Merge pull request #533 from edx/grady/fix-resize-bleed-through · a05d51fd
```
Grady/fix resize bleed through
```
  gradyward committed Jul 28, 2014
  a05d51fd Browse Files
- Changed the way that Zero Option Criteria are found in order to reduce query counts. · 0a573a17
  gradyward committed Jul 28, 2014
  
  0a573a17 Browse Files
- Merge pull request #537 from edx/sanchez/unhighlight-selected-options · bac66ff0
```
Un highlight invalidated example options on edit
```
  Stephen Sanchez committed Jul 28, 2014
  bac66ff0 Browse Files
- Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/fix-resize-bleed-through · 432591f6
```
Conflicts:
	openassessment/xblock/static/css/openassessment.css
```
  gradyward committed Jul 28, 2014
  432591f6 Browse Files
- Merge branch 'master' of https://github.com/edx/edx-ora2 into will/grady/self-assessment-feedback · 49cad1fa
```
Conflicts:
	openassessment/xblock/static/js/openassessment.min.js
```
  gradyward committed Jul 28, 2014
  49cad1fa Browse Files
- Added in changes to the grade xblock handler to show self assessed feedback · fb759242
  gradyward committed Jul 28, 2014
  
  fb759242 Browse Files
- Addressed Code review comments (test cases + formatting) · c2c84fe1
```
Did not do refactor to minimize queries yet.
```
  gradyward committed Jul 28, 2014
  c2c84fe1 Browse Files
25 Jul, 2014 1 commit
- Un highlight invalidated example options on edit · 09f0002f
  Stephen Sanchez committed Jul 25, 2014
  
  09f0002f Browse Files