Commits · 65ebba350e7edfac19edd49052de9559ad16191b · edx / edx-ora2 · GitLab

05 Oct, 2017 1 commit
- Merge pull request #1051 from edx/jeskew/more_django1.11_changes · 65ebba35
```
Another import move to support Django 1.11
```
  John Eskew committed Oct 05, 2017
  65ebba35 Browse Files
04 Oct, 2017 3 commits
- Bump version to 2.1.3 · b5d7a8c2
  John Eskew committed Oct 04, 2017
  
  b5d7a8c2 Browse Files
- Add comments to all imports moved into methods. · 1c5b01f1
  John Eskew committed Oct 04, 2017
  
  1c5b01f1 Browse Files
- Move peer_api import down into method for Django 1.11 · 4a086606
  John Eskew committed Oct 04, 2017
  
  4a086606 Browse Files
02 Oct, 2017 5 commits
- Merge pull request #1050 from edx/fsheets/release-update · b0cc7c69
```
Release Update v.2.1.2
```
  Farhanah Sheets committed Oct 02, 2017
  b0cc7c69 Browse Files
- Update version to 2.1.2 · 317afb4e
  Farhanah Sheets committed Oct 02, 2017
  
  317afb4e Browse Files
- Merge pull request #1049 from edx/jeskew/django_1.11_upgrade · ec35eb4c
```
Move model imports into methods, enabling django upgrade
```
  Troy Sankey committed Oct 02, 2017
  ec35eb4c Browse Files
- Merge pull request #1048 from edx/fsheets/automate-translations · 619e4ea5
```
Added validate_translations logic
```
  Eric Fischer committed Oct 02, 2017
  619e4ea5 Browse Files
- Move model imports and API imports down into method. · 1134a5b5
  John Eskew committed Oct 02, 2017
  
  1134a5b5 Browse Files
29 Sep, 2017 1 commit
- Updates to compile translations and openassesment config to focus directories · 0cbc7012
  Farhanah Sheets committed Sep 29, 2017
  
  0cbc7012 Browse Files
21 Sep, 2017 1 commit
- Added validate_translations logic to makefile, travis, & tox. · 3b2b6d6c
```
Remove previous translations scripts.
```
  Farhanah Sheets committed Sep 21, 2017
  3b2b6d6c Browse Files
06 Sep, 2017 4 commits
- Merge pull request #1047 from edx/efischer/cleanup · 8b999964
```
Cleanup of #1046
```
  Eric Fischer committed Sep 06, 2017
  8b999964 Browse Files
- Cleanup of #1046 · ae432ca3
  Eric Fischer committed Sep 06, 2017
  
  ae432ca3 Browse Files
- Merge pull request #1046 from edx/efischer/hotpatch · 453612fd
```
Be defensive against all types of example['answer']
```
  Eric Fischer committed Sep 06, 2017
  453612fd Browse Files
- Be defensive against all types of example['answer'] · 85edf001
  Eric Fischer committed Sep 06, 2017
  
  85edf001 Browse Files
05 Sep, 2017 8 commits
- Merge pull request #1045 from edx/rc/2.1.0 · 0dbe17de
```
Version 2.1.0
```
  Eric Fischer committed Sep 05, 2017
  0dbe17de Browse Files
- i18n updates · d03d9bf2
  Eric Fischer committed Sep 05, 2017
  
  d03d9bf2 Browse Files
- Version 2.1.0 · 8f679064
  Eric Fischer committed Sep 05, 2017
  
  8f679064 Browse Files
- Merge pull request #1044 from edx/rc/2.0.6 · 2ba77445
```
internal version 2.0.6
```
  Eric Fischer committed Sep 05, 2017
  2ba77445 Browse Files
- internal version 2.0.6 · f610cb53
  Eric Fischer committed Sep 05, 2017
  
  f610cb53 Browse Files
- Merge pull request #1043 from edx/ri/fix-learning-training-assessment-access · 88046f00
```
EDUCATOR-1263 Fix Learner Training Assessment assess
```
  Eric Fischer committed Sep 05, 2017
  88046f00 Browse Files
- Handle poorly-serialized training examples robustly · f4986a86
  Eric Fischer committed Sep 05, 2017
  
  f4986a86 Browse Files
- EDUCATOR-1263 Fix Learner Training Assessment assess · 3a727dea
  rabia23 committed Sep 05, 2017
  
  3a727dea Browse Files
31 Aug, 2017 4 commits
- Merge pull request #1042 from edx/rc/2.0.4 · b0a9f6d3
```
2.0.4
```
  Eric Fischer committed Aug 31, 2017
  b0a9f6d3 Browse Files
- 2.0.4 version bump · 1483c3f9
  Eric Fischer committed Aug 31, 2017
  
  1483c3f9 Browse Files
- Merge pull request #1041 from edx/ri/fix-learning-training-assessment-access · b248e4a4
```
EDUCATOR-1263 Fix Learner Training Assessment assess
```
  Eric Fischer committed Aug 31, 2017
  b248e4a4 Browse Files
- EDUCATOR-1263 Fix Learner Training Assessment assess · 5b5eb7ee
  rabia23 committed Aug 31, 2017
  
  5b5eb7ee Browse Files
30 Aug, 2017 2 commits
- Merge pull request #1040 from edx/aj/fix-file-upload-cancel · c767f366
```
Do not try to upload when popup is canceled during file upload
```
  Awais Jibran committed Aug 31, 2017
  c767f366 Browse Files
- Do not try to upload when popup is cancled during file upload · 8c599f3e
  Awais Jibran committed Aug 31, 2017
  
  8c599f3e Browse Files
22 Aug, 2017 6 commits
- Merge pull request #1039 from edx/efischer/boto_take2 · 7bee621d
```
match edx-platform version
```
  Eric Fischer committed Aug 22, 2017
  7bee621d Browse Files
- match edx-platform version · 13fe7e77
  Eric Fischer committed Aug 22, 2017
  
  13fe7e77 Browse Files
- Merge pull request #1038 from edx/rc/2.0.3 · 3136d72b
```
Rc/2.0.3
```
  Eric Fischer committed Aug 22, 2017
  3136d72b Browse Files
- version bump · dbedcb69
  Eric Fischer committed Aug 22, 2017
  
  dbedcb69 Browse Files
- i18n updates · a3b1add8
  Eric Fischer committed Aug 22, 2017
  
  a3b1add8 Browse Files
- Merge pull request #1037 from edx/efischer/back_to_boto · f2d4e6cb
```
Revert boto3 upgrade
```
  Eric Fischer committed Aug 22, 2017
  f2d4e6cb Browse Files
21 Aug, 2017 2 commits
- quality · 00f9b975
  Eric Fischer committed Aug 21, 2017
  
  00f9b975 Browse Files
- Switch back to boto · bb30a120
```
The boto3 upgrade seems to have broken in prod

EDUCATOR-1183, EDUCATOR-1203
```
  Eric Fischer committed Aug 21, 2017
  bb30a120 Browse Files
17 Aug, 2017 1 commit
- Merge pull request #1028 from edx/aj/fix-empty-file-name-in-response · 251005cf
```
Fix empty file description in ORA response - EDUCATOR-1054
```
  Awais Jibran committed Aug 17, 2017
  251005cf Browse Files
16 Aug, 2017 1 commit
- fix-empty-file-name-in-response. · 919b7b7b
  Awais Jibran committed Aug 17, 2017
  
  919b7b7b Browse Files
15 Aug, 2017 1 commit
- Merge pull request #1036 from edx/bmedx/upgrade_django-model-utils · fb9de0a5
```
Upgrade edx-submissions, django-model-utils
```
  Brian Mesick committed Aug 15, 2017
  fb9de0a5 Browse Files