Commits · 94aeb71e685fe5e8a17bb3b6af31dfb08e7e75f9 · edx / edx-ora2 · GitLab

29 May, 2014 9 commits
- Merge branch 'master' into ai-grading · 94aeb71e
```
Conflicts:
	apps/openassessment/xblock/test/data/invalid_rubrics.json
	apps/openassessment/xblock/test/data/valid_rubrics.json
	apps/openassessment/xblock/test/test_message.py
```
  Will Daly committed May 29, 2014
  94aeb71e Browse Files
- Merge pull request #366 from edx/will/ai-grading-s3-bucket-prefix · 15394871
```
Will/ai grading s3 bucket prefix
```
  Will Daly committed May 29, 2014
  15394871 Browse Files
- Merge pull request #369 from edx/sanchez/ai-workflow-integration · cdcab7f1
```
Workflow API Integration for AI
```
  Stephen Sanchez committed May 29, 2014
  cdcab7f1 Browse Files
- Merge pull request #367 from edx/will/add-ease-algorithm-to-settings · e3538d92
```
Will/add ease algorithm to settings
```
  Will Daly committed May 29, 2014
  e3538d92 Browse Files
- Adding Workflow API support for AI grading · 1dbf9d97
  Stephen Sanchez committed May 29, 2014
  
  1dbf9d97 Browse Files
- Merge pull request #371 from edx/will/fix-dev-docs · 860b28fd
```
Fix developer docs
```
  Will Daly committed May 29, 2014
  860b28fd Browse Files
- Add Django setting to prepend a prefix to the S3 bucket path · 9eeddcee
  Will Daly committed May 29, 2014
  
  9eeddcee Browse Files
- Test datetime fixups · 4362fd1a
  Will Daly committed May 28, 2014
  
  4362fd1a Browse Files
- Fix developer docs · 6f41e465
  Will Daly committed May 28, 2014
  
  6f41e465 Browse Files
28 May, 2014 4 commits
- Merge pull request #368 from edx/will/ai-grading-api-docs · 4dcb5d66
```
Add AI grading to the API docs
```
  Will Daly committed May 28, 2014
  4dcb5d66 Browse Files
- Add AI grading to the API documentation · 81d24b5b
```
ORA2 Developer Doc - file cleanup

Updated path in conf.py file
```
  Will Daly committed May 28, 2014
  81d24b5b Browse Files
- Merge pull request #363 from edx/will/TIM-574-take-2 · d0e30e1d
```
Validation: cannot rename criteria post-release
```
  Will Daly committed May 28, 2014
  d0e30e1d Browse Files
- Add EASE AI algorithm to dev settings · 0f1d7151
  Will Daly committed May 28, 2014
  
  0f1d7151 Browse Files
27 May, 2014 5 commits
- Merge pull request #365 from edx/will/ai-grading-xml-rules · 22732a0f
```
Will/ai grading xml rules
```
  Will Daly committed May 27, 2014
  22732a0f Browse Files
- Added more validation rules for example-based assessment XML · 548a01c4
  Will Daly committed May 27, 2014
  
  548a01c4 Browse Files
- Merge pull request #364 from edx/will/ai-grading-pr-feedback · 11a59fd7
```
Will/ai grading pr feedback
```
  Will Daly committed May 27, 2014
  11a59fd7 Browse Files
- Respond to PR feedback · 5378d5ae
  Will Daly committed May 27, 2014
  
  5378d5ae Browse Files
- Validation: cannot rename criteria post-release · d57d3553
  Will Daly committed May 27, 2014
  
  d57d3553 Browse Files
23 May, 2014 10 commits
- Merge pull request #362 from edx/will/ai-grading-info-level-logging · 3fef491d
```
Will/ai grading info level logging
```
  Will Daly committed May 23, 2014
  3fef491d Browse Files
- Add info-level logging for AI grading and training · 53d095ab
  Will Daly committed May 23, 2014
  
  53d095ab Browse Files
- 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
```
  Will Daly committed May 23, 2014
  ac4251dd Browse Files
- Merge pull request #361 from edx/will/rubric-options-ids-optimization · 1eee3a83
```
Will/rubric options ids optimization
```
  Will Daly committed May 23, 2014
  1eee3a83 Browse Files
- Cache the dictionary mapping criteria/points to option IDs · 506ed2e4
```
Reorganize assessment model tests.
```
  Will Daly committed May 23, 2014
  506ed2e4 Browse Files
- Merge pull request #360 from edx/will/ai-grading-tests · c9909779
```
Will/ai grading tests
```
  Will Daly committed May 23, 2014
  c9909779 Browse Files
- Add tests for AI grading API calls · bedbab88
  Will Daly committed May 23, 2014
  
  bedbab88 Browse Files
- Merge pull request #359 from edx/will/TIM-588 · 10df7db7
```
Bugfix: TIM-588
```
  Will Daly committed May 23, 2014
  10df7db7 Browse Files
- Remove 'you do not have permission' message from staff debug info in studio preview · 632ac0a8
  Will Daly committed May 23, 2014
  
  632ac0a8 Browse Files
- Merge pull request #358 from edx/will/ai-grading · bd087b5f
```
Implement AI grading task, database models, and API calls.
```
  Will Daly committed May 23, 2014
  bd087b5f Browse Files
22 May, 2014 12 commits
- Merge pull request #357 from edx/will/update-testing-course · 0ad5906e
```
Add more problem types to the test course
```
  Will Daly committed May 22, 2014
  0ad5906e Browse Files
- Add more problem types to the test course · a863e0ae
  Will Daly committed May 22, 2014
  
  a863e0ae Browse Files
- Merge pull request #340 from gradyward/gradyward/wire-up-ui · 691f9bc5
```
TIM 386 -- Wire up UI messages
```
  gradyward committed May 22, 2014
  691f9bc5 Browse Files
- Implement AI grading task, database models, and API calls. · 74a9d63e
  Will Daly committed May 22, 2014
  
  74a9d63e Browse Files
- Merge remote-tracking branch 'origin/master' into ai-grading · ec584292
```
Conflicts:
	apps/openassessment/xblock/staff_info_mixin.py
```
  Will Daly committed May 22, 2014
  ec584292 Browse Files
- TIM 386 -- Wire up UI messages · c217e3c3
```
Adds Unit Tests to UI messages and fixes Two syntax errors

Added Test Cases and changed return Methodology

Removed Comments that were not in Style

Added cases for Student Training

TIM 386 -- Wire Up UI Messages
```
  gradyward committed May 22, 2014
  c217e3c3 Browse Files
- Merge pull request #354 from edx/will/error-msg-fixups · e3d07655
```
Remove deprecated Exception.message calls; fix TIM-497
```
  Will Daly committed May 22, 2014
  e3d07655 Browse Files
- Merge pull request #356 from edx/will/use-old-course-locations-for-staff-info · f66dd0c2
```
Back to old-style locations for course staff info
```
  Will Daly committed May 22, 2014
  f66dd0c2 Browse Files
- Merge pull request #349 from edx/will/ease-integration · c1f0555a
```
Will/ease integration
```
  Will Daly committed May 22, 2014
  c1f0555a Browse Files
- Revert "Show new-style locations in course staff debug info (opaque keys update)" · 7cc66b0e
```
This reverts commit 24df7773.
```
  Will Daly committed May 22, 2014
  7cc66b0e Browse Files
- Merge pull request #355 from edx/will/TIM-585 · 728d7d6b
```
Bugfix: TIM-585
```
  Will Daly committed May 22, 2014
  728d7d6b Browse Files
- Fix a 500 error caused by retrieving peer workflow after an integrity error when… · 47b931aa
```
Fix a 500 error caused by retrieving peer workflow after an integrity error when using repeatable-read
```
  Will Daly committed May 22, 2014
  47b931aa Browse Files