Commits · b9370273b1201069122812dc2e9103c10712e3e0 · edx / edx-ora2 · GitLab

30 May, 2014 6 commits
- Merge pull request #382 from edx/will/ai-workflow-uuid-unique · b9370273
```
Will/ai workflow uuid unique
```
  Will Daly committed May 30, 2014
  b9370273 Browse Files
- Add a uniqueness constraint on AIWorkflow UUIDs · bdfa4755
  Will Daly committed May 30, 2014
  
  bdfa4755 Browse Files
- Merge pull request #370 from edx/gradyward/ai-rescheduling · 1cbe38d0
```
Gradyward/ai rescheduling
```
  gradyward committed May 30, 2014
  1cbe38d0 Browse Files
- Merge pull request #380 from edx/sanchez/update_staff_debug · 85bf71f7
```
Sanchez/update staff debug
```
  Stephen Sanchez committed May 30, 2014
  85bf71f7 Browse Files
- Added in regrading functionality · 9802ff82
```
Also added automatic grading after training completes

Many code review edits
```
  gradyward committed May 30, 2014
  9802ff82 Browse Files
- Updating Staff Debug section for AI · 21b47b01
  Stephen Sanchez committed May 30, 2014
  
  21b47b01 Browse Files
29 May, 2014 17 commits
- Merge pull request #379 from edx/sanchez/create_rubric_properly · d9f28950
```
Sanchez/create rubric properly
```
  Stephen Sanchez committed May 29, 2014
  d9f28950 Browse Files
- Merge pull request #374 from edx/will/simulate-grading-error-cmd · 58346996
```
Will/simulate grading error cmd
```
  Will Daly committed May 29, 2014
  58346996 Browse Files
- Merge pull request #376 from edx/will/ai-models-admin · 1bef091d
```
Will/ai models admin
```
  Will Daly committed May 29, 2014
  1bef091d Browse Files
- Updating the way we create rubrics in the workflow mixin · ed23c788
  Stephen Sanchez committed May 29, 2014
  
  ed23c788 Browse Files
- Merge pull request #377 from edx/will/celery-broker-settings · e4b445b5
```
Will/celery broker settings
```
  Will Daly committed May 29, 2014
  e4b445b5 Browse Files
- Configure Celery to use RabbitMQ (default credentials and host) when running workbench · 0da1e744
  Will Daly committed May 29, 2014
  
  0da1e744 Browse Files
- Add AI models to the admin page · f060c25a
  Will Daly committed May 29, 2014
  
  f060c25a Browse Files
- Added management command to simulate AI grading task errors by creating… · 9347baf3
```
Added management command to simulate AI grading task errors by creating incomplete workflows in the database
```
  Will Daly committed May 29, 2014
  9347baf3 Browse Files
- 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 8 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