Commits · 4928018320c42ff8a8a2f7b5ed1a92797db7f6d6 · edx / edx-ora2

29 Jul, 2014 5 commits
- 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 #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
- Clarify naming of Javascript minify task · a3e18a30
  Will Daly committed Jul 29, 2014
  
  a3e18a30 Browse Files
28 Jul, 2014 9 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
- 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
- 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 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 6 commits
- Changed the template for rendering feedback to encorporate self feedback, and… · 3d3921b1
```
Changed the template for rendering feedback to encorporate self feedback, and changed the handler to provide appropriate context
```
  gradyward committed Jul 25, 2014
  3d3921b1 Browse Files
- Merge pull request #531 from edx/frances/fix/step-status-layout · f2f55958
```
Prevent Step Status Wrap
```
  frances botsford committed Jul 25, 2014
  f2f55958 Browse Files
- recompiled css · 31dd658f
  Frances Botsford committed Jul 25, 2014
  
  31dd658f Browse Files
- adjusted the width of the step status to prevent wrapping on smaller screens · 7af8fd3f
  Frances Botsford committed Jul 25, 2014
  
  7af8fd3f Browse Files
- Merge pull request #523 from edx/grady/image-submission-ux · 6f2d0085
```
Cleaned up styles around image submissions
```
  gradyward committed Jul 25, 2014
  6f2d0085 Browse Files
- Cleaned up styles around image submissions · ca1dc33b
  gradyward committed Jul 25, 2014
  
  ca1dc33b Browse Files
24 Jul, 2014 7 commits
- Changed some of models/base.py to reflect the increased complexity · 91a5c710
  gradyward committed Jul 24, 2014
  
  91a5c710 Browse Files
- WIP: Self Criterion Feedback API change · 8a4e5d9f
```
Conflicts:
	openassessment/assessment/api/self.py
	openassessment/xblock/self_assessment_mixin.py
	openassessment/xblock/test/test_self.py
```
  gradyward committed Jul 24, 2014
  8a4e5d9f Browse Files
- Update self assessment XBlock handler · 1d52e869
  Will Daly committed Jul 24, 2014
  
  1d52e869 Browse Files
- Add feedback to JS server selfAssess() · 260cfe7a
```
Move overall feedback method from the peer assessment JS view to the rubric

Self assessment JS sends feedback to the server
```
  Will Daly committed Jul 24, 2014
  260cfe7a Browse Files
- Move the rubric into its own template · 188fdfde
  Will Daly committed Jul 24, 2014
  
  188fdfde Browse Files
- Merge pull request #530 from edx/will/fix-tests · 17bbb3e6
```
Fix test settings so all non-acceptance tests run
```
  Will Daly committed Jul 24, 2014
  17bbb3e6 Browse Files
- Fix test settings so all non-acceptance tests run · 76f62a02
  Will Daly committed Jul 24, 2014
  
  76f62a02 Browse Files
23 Jul, 2014 7 commits
- Merge pull request #525 from edx/will/update-i18n-strings · cf19d9ad
```
Update i18n strings
```
  Will Daly committed Jul 23, 2014
  cf19d9ad Browse Files
- Merge pull request #524 from edx/will/more-i18n-automation · 52820d62
```
More i18n automation
```
  Will Daly committed Jul 23, 2014
  52820d62 Browse Files
- Merge pull request #526 from edx/will/fix-makefile-test-cmd · a13cc165
```
Add phony target to Makefile for test and install
```
  Will Daly committed Jul 23, 2014
  a13cc165 Browse Files
- Fix import error caused by naming a package "selenium" · 33b9ee81
```
Install bok-choy
```
  Will Daly committed Jul 23, 2014
  33b9ee81 Browse Files
- Add phony target to Makefile for test and install · a03196c7
  Will Daly committed Jul 23, 2014
  
  a03196c7 Browse Files
- Update i18n strings · 96559640
  Will Daly committed Jul 23, 2014
  
  96559640 Browse Files
- Remove i18n from test commands · 6ccb842f
```
Update i18n scripts and README
```
  Will Daly committed Jul 23, 2014
  6ccb842f Browse Files
18 Jul, 2014 1 commit
- Merge pull request #513 from edx/will/student-training-test · 8b07411a
```
More selenium
```
  Will Daly committed Jul 18, 2014
  8b07411a Browse Files
17 Jul, 2014 5 commits
- Save screenshots on selenium test failure · 97eb3771
```
Add a selenium test for peer-only

Move bok-choy into its own requirements file

Fix import errors in test course

Add tests for student training

Add retry with exponential backoff
```
  Will Daly committed Jul 17, 2014
  97eb3771 Browse Files
- Merge pull request #510 from edx/will/selenium · b8be7f5f
```
Selenium (part 1)
```
  Will Daly committed Jul 17, 2014
  b8be7f5f Browse Files
- Merge pull request #509 from edx/grady/ORA-666 · 20f0f066
```
Added in conditional logic to the Submission Messaging Section
```
  gradyward committed Jul 17, 2014
  20f0f066 Browse Files
- Added in conditional logic to the Submission Messaging Section · 03902689
  gradyward committed Jul 17, 2014
  
  03902689 Browse Files
- Move perf tests into a subdirectory · 96dd57b3
```
Add bok choy to the test requirements
Add Selenium tests for the self-only flow.
```
  Will Daly committed Jul 17, 2014
  96dd57b3 Browse Files