Commits · 93464298e420d1c4033a4b2dd35600b74029ab16 · edx / edx-platform

27 Nov, 2017 11 commits
- Merge remote-tracking branch 'upstream/master' into… · 93464298
```
Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip]
```
  Jose Antonio Gonzalez committed Nov 27, 2017
  93464298 Browse Files
- Merge pull request #16652 from edx/add-persistent-grade-override-table-in-admin · b6d9dfb2
```
Add `PersistentSubsectionGradeOverride` table in django admin
```
  sanfordstudent committed Nov 27, 2017
  b6d9dfb2 Browse Files
- Merge pull request #16662 from edx/jmbowman/more_ssencrypt_tests · 139fa895
```
Add more ssencrypt tests
```
  Jeremy Bowman committed Nov 27, 2017
  139fa895 Browse Files
- Add `PersistentSubsectionGradeOverride` table in django admin · baa967ca
```
EDUCATOR-1624
```
  Awais Jibran committed Nov 27, 2017
  baa967ca Browse Files
- Merge pull request #16602 from edx/tuchfarber/fix_instructor_ordering · 1d8613f3
```
Fix instructors ordering on program marketing page
```
  Matt Tuchfarber committed Nov 27, 2017
  1d8613f3 Browse Files
- Merge pull request #16645 from edx/bmedx/django111_fix_cms_failures · 4a938c14
```
Fixes to common/openedx tests that reference apps CMS doesn't use
```
  Brian Mesick committed Nov 27, 2017
  4a938c14 Browse Files
- Merge pull request #16649 from edx/bmedx/django111_tag_test_failures_lms_1 · 9911c8d0
```
Tag LMS Unit 1 tests that fail in Django 1.11
```
  Brian Mesick committed Nov 27, 2017
  9911c8d0 Browse Files
- Merge pull request #16655 from edx/bmedx/django111_tag_test_failures_lms_2 · 3d5fef78
```
Tag LMS Unit 2 tests that fail in Django 1.11
```
  Brian Mesick committed Nov 27, 2017
  3d5fef78 Browse Files
- Merge pull request #16672 from edx/mushtaq/val-version-bump · 4a0d6264
```
VAL version bump
```
  Mushtaq Ali committed Nov 27, 2017
  4a0d6264 Browse Files
- VAL version bump - EDUCATOR-1809 · 37bbfd0a
  Mushtaq Ali committed Nov 27, 2017
  
  37bbfd0a Browse Files
- Merge pull request #16673 from edx/raees/LEARNER-2881-header-logo-link-to-mktg-root · e739bc82
```
Fix header logo link to MKTG root.
```
  raeeschachar committed Nov 27, 2017
  e739bc82 Browse Files
24 Nov, 2017 5 commits
- dont redefine post method [ci skip] · 7a1dd74a
  Jose Antonio Gonzalez committed Nov 24, 2017
  
  7a1dd74a Browse Files
- Fix header logo link to MKTG root. · 5196f4b1
```
In courseware, banner Logo links to Dashboard, footer logo
links to home page.

LEARNER-2881
```
  raeeschachar committed Nov 24, 2017
  5196f4b1 Browse Files
- fix pep8 · 5150a960
  Jose Antonio Gonzalez committed Nov 24, 2017
  
  5150a960 Browse Files
- fix pylint [ci skip] · 0171e797
  Jose Antonio Gonzalez committed Nov 24, 2017
  
  0171e797 Browse Files
- Merge remote-tracking branch 'upstream/master' into… · 2e45a9b1
```
Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip]
```
  Jose Antonio Gonzalez committed Nov 24, 2017
  2e45a9b1 Browse Files
23 Nov, 2017 8 commits
- Merge pull request #16666 from edx/LEARNER-2653-update-django-wiki-version · dd2f90fb
```
LEARNER-2653 Update django-wiki version
```
  Ayub khan committed Nov 23, 2017
  dd2f90fb Browse Files
- Merge pull request #16667 from edx/Update_pull_translations_Nov_23 · 4aeb7f10
```
Updated pull Translations
```
  Ayub khan committed Nov 23, 2017
  4aeb7f10 Browse Files
- Updated Translations · 9e619e42
  ayub-khan committed Nov 23, 2017
  
  9e619e42 Browse Files
- Merge pull request #16620 from… · 6e720650
```
Merge pull request #16620 from edx/ahsan/LEARNER-3298-Learner-certificates-should-not-be-findable-before-available-date

Learner certificates should not be findable before the available date
```
  Ahsan Ul Haq committed Nov 23, 2017
  6e720650 Browse Files
- update django-wiki version · 992832ca
  ayub-khan committed Nov 23, 2017
  
  992832ca Browse Files
- Learner certificates should not be findable before the available date · da675e52
```
LEARNER-3298
```
  Ahsan Ulhaq committed Nov 23, 2017
  da675e52 Browse Files
- Merge pull request #16510 from open-craft/mtyaka/lms-internal-root-url · dcb77ff7
```
Introduce LMS_INTERNAL_ROOT_URL.
```
  Matjaz Gregoric committed Nov 23, 2017
  dcb77ff7 Browse Files
- Introduce LMS_INTERNAL_ROOT_URL. · d403e5f8
```
The LMS and edx-enterprise currently communicate via REST APIs, even
though they are all running within the same service.

Currently API URLs are constructed using LMS_ROOT_URL, but that is
problematic on some systems where the external LMS_ROOT_URL is not
accessible from the private network, or routing internal requests via
the external URL is not desireable.

This patch introduces a new setting variable LMS_INTERNAL_ROOT_URL which
defaults to the value of LMS_ROOT_URL for backwards compatibility.

The LMS and edx-enterprise will use LMS_INTERNAL_ROOT_URL to construct
API URLs instead of LMS_ROOT_URL.
```
  Matjaz Gregoric committed Nov 23, 2017
  d403e5f8 Browse Files
22 Nov, 2017 16 commits
- Add more ssencrypt tests · b00b6b89
  Jeremy Bowman committed Nov 22, 2017
  
  b00b6b89 Browse Files
- Merge pull request #16657 from edx/bbeggs/sorl-thumbnail · 705aac79
```
Pin sorl-thumbnail to 12.3
```
  Brian Beggs committed Nov 22, 2017
  705aac79 Browse Files
- Tag LMS Unit 2 tests that fail in Django 1.11 · d827d47b
  bmedx committed Nov 22, 2017
  
  d827d47b Browse Files
- Tag LMS Unit 1 tests that fail in Django 1.11 · 5fbbf497
  bmedx committed Nov 22, 2017
  
  5fbbf497 Browse Files
- Fixes to common/openedx tests that reference apps CMS doesn't use · d3e6836d
  bmedx committed Nov 22, 2017
  
  d3e6836d Browse Files
- Pin sorl-thumbnail to 12.3 · 423b932e
  Brian Beggs committed Nov 22, 2017
  
  423b932e Browse Files
- Merge pull request #16661 from cpennington/fix-linting-errors · aa0377b0
```
Fix linting errors from https://github.com/edx/edx-platform/pull/16615
```
  Calen Pennington committed Nov 22, 2017
  aa0377b0 Browse Files
- Merge pull request #16659 from edx/release-mergeback-to-master · c23b0fce
```
Merge release back to master
```
  edx-pipeline-bot committed Nov 22, 2017
  c23b0fce Browse Files
- Fix linting errors from https://github.com/edx/edx-platform/pull/16615 · 48abc492
  Calen Pennington committed Nov 22, 2017
  
  48abc492 Browse Files
- Convert unicode to bytes for RSA encryption · 4ba29b47
  Jeremy Bowman committed Nov 22, 2017
  
  4ba29b47 Browse Files
- Merge pull request #16650 from edx/nedbat/fix-unused-imports · a2e2aace
```
Fix a number of unused-import pylint violations
```
  Ned Batchelder committed Nov 22, 2017
  a2e2aace Browse Files
- Merge pull request #16647 from edx/jeskew/custom_template_loader_fixes · 872df1e4
```
Change template's deprecated '=' comparison to '=='.
```
  John Eskew committed Nov 22, 2017
  872df1e4 Browse Files
- Correct a mock that was at the wrong module · c966707a
  Ned Batchelder committed Nov 22, 2017
  
  c966707a Browse Files
- Merge pull request #16566 from edx/mattdrayer/ENT-686-5 · 8d1053ee
```
Better handling of data for OData API exception handling
```
  Matt Drayer committed Nov 22, 2017
  8d1053ee Browse Files
- Better handling of data for OData API exception handling · 9b4be936
  Matt Drayer committed Nov 21, 2017
  
  9b4be936 Browse Files
- Merge pull request #16615 from edx/cale/schedules-admin-improvements · 7aa1a346
```
Cale/schedules admin improvements
```
  Calen Pennington committed Nov 21, 2017
  7aa1a346 Browse Files