Commits · release-2017-08-24-10.43 · edx / edx-platform · GitLab

23 Aug, 2017 19 commits
- Merge pull request #15880 from edx/ret/remove-extraneous-request-argument · 3aa02f29
```
Remove extraneous request argument to experiments.utils.check_and_get…
```
  Calen Pennington committed Aug 23, 2017
  3aa02f29 Browse Files
- Merge pull request #15879 from edx/ret/mako-template-comments · c773e45b
```
Teach the mako template linter to understand django-format comments
```
  Calen Pennington committed Aug 23, 2017
  c773e45b Browse Files
- Merge pull request #15877 from edx/ret/course-mode-factory · 6c9b38dc
```
Use a consistent CourseModeFactory from the course_modes module, rath…
```
  Calen Pennington committed Aug 23, 2017
  6c9b38dc Browse Files
- Merge pull request #15876 from edx/ret/test-output-redirect · 8df57c7c
```
Write test output to logs, rather than to stdout to avoid blowing up …
```
  Calen Pennington committed Aug 23, 2017
  8df57c7c Browse Files
- Merge pull request #15885 from edx/zoldak/EDUCATOR-1233 · 83dee244
```
Remove flaky test PreRequisiteCourseTest.test_dashboard_message
```
  Jesse Zoldak committed Aug 23, 2017
  83dee244 Browse Files
- Improve ability to discriminate between django and mako template · f6b061c7
```
Django-format comments are now used to detect a django template.
Note: Django templates are still not linted.
```
  Calen Pennington committed Aug 23, 2017
  f6b061c7 Browse Files
- Use a consistent CourseModeFactory from the course_modes module, rather than using one from student · 63244b51
  Calen Pennington committed Aug 23, 2017
  
  63244b51 Browse Files
- Merge pull request #15883 from edx/ret/remove-old-test · a08447e4
```
Remove a test that was only valid for XML-backed courses
```
  Calen Pennington committed Aug 23, 2017
  a08447e4 Browse Files
- Remove flaky test PreRequisiteCourseTest.test_dashboard_message · 8cca5d16
  Jesse Zoldak committed Aug 23, 2017
  
  8cca5d16 Browse Files
- fixup! Write test output to logs, rather than to stdout to avoid blowing up jenkins · 04e67b81
  Calen Pennington committed Aug 23, 2017
  
  04e67b81 Browse Files
- Write test output to logs, rather than to stdout to avoid blowing up jenkins · 8d5e0254
  Calen Pennington committed Aug 23, 2017
  
  8d5e0254 Browse Files
- Merge pull request #15873 from edx/saleem-latif/ENT-612 · 3131790a
```
ENT-612: Version upgrade for edx-enterprise that contains fix for 500 error on enterprise landing page.
```
  Saleem Latif committed Aug 23, 2017
  3131790a Browse Files
- Remove a test that was only valid for XML-backed courses · bfd7241e
  Calen Pennington committed Aug 23, 2017
  
  bfd7241e Browse Files
- Remove extraneous request argument to experiments.utils.check_and_get_upgrade_link · 127e90e3
  Calen Pennington committed Aug 23, 2017
  
  127e90e3 Browse Files
- Merge pull request #15874 from edx/jlajoie/EDUCATOR-1135-add-null-check · f79e9da0
```
EDUCATOR-1135: Adds in null check cohort management command
```
  Jeff LaJoie committed Aug 23, 2017
  f79e9da0 Browse Files
- Merge pull request #15867 from edx/LEARNER-1510 · a23b7469
```
Fix unenrollment survey when multiple courses are present
```
  Matthew Piatetsky committed Aug 23, 2017
  a23b7469 Browse Files
- Merge pull request #15844 from edx/estute/remove-skipped-flaky-tests · 73181617
```
remove or unskip skipped flaky tests
```
  Stu Young committed Aug 23, 2017
  73181617 Browse Files
- adds in null check for swap from auto track cohort management command · 87db8fcf
  Jeff LaJoie committed Aug 23, 2017
  
  87db8fcf Browse Files
- Version upgrade for edx-enterprise that contains fix for 500 error on enterprise landing page. · 5d7d191e
  Saleem Latif committed Aug 23, 2017
  
  5d7d191e Browse Files
22 Aug, 2017 20 commits
- Merge pull request #15865 from edx/efischer/ora_2.0.3 · d16363d6
```
update edx-ora2
```
  Eric Fischer committed Aug 22, 2017
  d16363d6 Browse Files
- Fix selectors so that unenrollment survey works with multiple courses · dcee7855
  Matthew Piatetsky committed Aug 22, 2017
  
  dcee7855 Browse Files
- Revert revert of unenrollment survey. · 7c0423ff
```
This reverts commit e2ee48c3.
```
  Matthew Piatetsky committed Aug 22, 2017
  7c0423ff Browse Files
- Merge pull request #15843 from edx/robrap/LEARNER-1858-show-join-date-2 · 40a5b066
```
Support for joined date to profile.
```
  Diana Huang committed Aug 22, 2017
  40a5b066 Browse Files
- Merge pull request #15861 from edx/LEARNER-174 · 04da157e
```
LEARNER-174 Make country label and error message more user friendly
```
  Ayub khan committed Aug 23, 2017
  04da157e Browse Files
- update edx-ora2 · 926e5a49
  Eric Fischer committed Aug 22, 2017
  
  926e5a49 Browse Files
- Updated Country Label and help text · e737728c
```
Country Label was causing confusions for learners if it was country of origin or in which they
are living so changed it to a more appropriate message.
LEARNER-174
Also updated some other error messages to some more appropriate error messages.
```
  ayub-khan committed Aug 22, 2017
  e737728c Browse Files
- Merge pull request #15864 from edx/revert-15828-LEARNER-1510 · 6e607fcc
```
Revert "Un-revert unenrollment survey and only show it for edx.org users"
```
  Matthew Piatetsky committed Aug 22, 2017
  6e607fcc Browse Files
- Revert "Un-revert unenrollment survey and only show it for edx.org users" · e2ee48c3
  Matthew Piatetsky committed Aug 22, 2017
  
  e2ee48c3 Browse Files
- Merge pull request #15859 from edx/bexline/enterprise_version_bump · 8c2586f6
```
ENT-585 Enterprise: Change course modal to use discovery api
```
  Brittney Exline committed Aug 22, 2017
  8c2586f6 Browse Files
- EDUCATOR-1204 | can always view certs when ready for self-paced courses; don't… · 2cc87952
```
EDUCATOR-1204 | can always view certs when ready for self-paced courses; don't hide cert buttons; update messaging.
```
  Alex Dusenbery committed Aug 22, 2017
  2cc87952 Browse Files
- Support for joined date to profile. · 7cc9400b
```
LEARNER-1858
```
  Robert Raposa committed Aug 22, 2017
  7cc9400b Browse Files
- Merge pull request #15813 from edx/yro/update_cert · b8aa3052
```
Update Certificate Task Call
```
  Gregory Martin committed Aug 22, 2017
  b8aa3052 Browse Files
- Merge pull request #15828 from edx/LEARNER-1510 · 839b5320
```
Un-revert unenrollment survey and only show it for edx.org users
```
  Matthew Piatetsky committed Aug 22, 2017
  839b5320 Browse Files
- Merge pull request #15821 from edx/bmedx/upgrade_django_model_utils · 6f30dedb
```
Upgrade of django-model-utils to 3.0.0 for Django 1.11 support
```
  Brian Mesick committed Aug 22, 2017
  6f30dedb Browse Files
- Update unenrollment survey to only be included for edx.org and rebase with master · 25ffb356
  Matthew Piatetsky committed Aug 22, 2017
  
  25ffb356 Browse Files
- Revert "Revert "LEARNER-1510 Add unenrollment reason survey"" · 98cf69ba
```
This reverts commit 441bccf4.
```
  Matthew Piatetsky committed Aug 22, 2017
  98cf69ba Browse Files
- Merge pull request #15857 from edx/diana/change-icon · 2cd20d28
```
Use an X icon instead of text.
```
  Diana Huang committed Aug 22, 2017
  2cd20d28 Browse Files
- Update Task · b19d8059
  Gregory Martin committed Aug 22, 2017
  
  b19d8059 Browse Files
- Use an X icon instead of text. · cb381a7c
  Diana Huang committed Aug 22, 2017
  
  cb381a7c Browse Files
21 Aug, 2017 1 commit
- ENT-585 Enterprise: Change course modal to use discovery api · b6e4e175
  Brittney Exline committed Aug 21, 2017
  
  b6e4e175 Browse Files