Commits · 9eeddceea72a8ac54efea49121385ee0b5dfacb7 · edx / edx-ora2 · GitLab

29 May, 2014 1 commit
- Add Django setting to prepend a prefix to the S3 bucket path · 9eeddcee
  Will Daly committed May 29, 2014
  
  9eeddcee Browse Files
27 May, 2014 4 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
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 18 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
- Merge pull request #353 from edx/will/refactor-training-api-call · 01724eb9
```
Will/refactor training api call
```
  Will Daly committed May 22, 2014
  01724eb9 Browse Files
- Remove deprecated Exception.message calls; fix TIM-497 · 1d59979e
  Will Daly committed May 22, 2014
  
  1d59979e Browse Files
- Changed the name to the correct "example-based-assessment" · 2915697b
  gradyward committed May 22, 2014
  
  2915697b Browse Files
- Added XML validation for "sample-based-assessments" (AI) · 24a06ceb
  gradyward committed May 22, 2014
  
  24a06ceb Browse Files
- Refactor training API call to move logic into AITrainingWorkflow model · e424c439
  Will Daly committed May 22, 2014
  
  e424c439 Browse Files
- Added fake AI Algorithm; add EASE wrapper for AI training · 0749ce1d
  Will Daly committed May 21, 2014
  
  0749ce1d Browse Files
21 May, 2014 7 commits
- Merge pull request #352 from edx/will/ai-grading-test-fixup · 44ad63d8
```
Will/ai grading test fixup
```
  Will Daly committed May 21, 2014
  44ad63d8 Browse Files
- Fix integration between staff info button and AI training API data formats · 3c0ac810
  Will Daly committed May 21, 2014
  
  3c0ac810 Browse Files
- Merge pull request #351 from edx/sanchez/TIM-583-schedule-training · b93fd0d7
```
TIM 583 schedule training button admin only
```
  Stephen Sanchez committed May 21, 2014
  b93fd0d7 Browse Files
- Adding front-end admin action to schedule training tasks. · 476285c7
  Stephen Sanchez committed May 21, 2014
  
  476285c7 Browse Files
- Merge pull request #350 from edx/sylvia/docs/DOC-416 · 2e668da1
```
Sylvia/docs/doc 416
```
  srpearce committed May 21, 2014
  2e668da1 Browse Files
- Reorganize folder structure for documentation · deb7e416
  Sylvia Pearce committed May 21, 2014
  
  deb7e416 Browse Files
- Merge pull request #346 from edx/will/ai-training-schedule-calls · 6883bfc0
```
AI training API and models
```
  Will Daly committed May 21, 2014
  6883bfc0 Browse Files