Commits · 64dd633fc996cbfc1946e35ac13257e6b3a1ffd4 · edx / edx-platform

28 Nov, 2017 12 commits
- Merge pull request #15846 from edx/ormsbee/decaffeinate_tests_2 · 64dd633f
```
WIP: Decaffeinate Test Files (Part 2)
```
  Calen Pennington committed Nov 28, 2017
  64dd633f Browse Files
- Merge pull request #16629 from open-craft/smarnach/okta-sso · 6635deec
```
Small fixes to support Okta SSO.
```
  Sven Marnach committed Nov 28, 2017
  6635deec Browse Files
- Small fixes to support Okta SSO. · b77bff4d
  Sven Marnach committed Nov 28, 2017
  
  b77bff4d Browse Files
- Merge pull request #15511 from proversity-org/proversity/add-recover-password-endpoint · 3d087d5c
```
Add recover password endpoint
```
  Brian Beggs committed Nov 28, 2017
  3d087d5c Browse Files
- Merge pull request #16540 from open-craft/mtyaka/mongo-read-preference · 622ee7a7
```
Convert mongo read_preference setting at a lower level.
```
  Brian Beggs committed Nov 28, 2017
  622ee7a7 Browse Files
- Merge pull request #16692 from edx/douglashall/update_edx_enterprise_0_53_19 · 900f066d
```
Update edx-enterprise package to 0.53.19.
```
  Douglas Hall committed Nov 28, 2017
  900f066d Browse Files
- Merge remote-tracking branch 'upstream/master' into… · 9cf0b335
```
Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip]
```
  Jose Antonio Gonzlez committed Nov 28, 2017
  9cf0b335 Browse Files
- Merge pull request #16646 from edx/pacing/highlights-setting-UI-for-courses · c21895a8
```
Pacing/highlights setting ui for courses
```
  Alessandro Roux committed Nov 28, 2017
  c21895a8 Browse Files
- Update edx-enterprise package to 0.53.19. · a3746067
  Douglas Hall committed Nov 28, 2017
  
  a3746067 Browse Files
- Merge pull request #16689 from edx/saleem-latif/ENT-740-version-upgrade · 7f60dcb2
```
ENT-740: edx-enterprise version upgrade to 0.53.18
```
  Douglas Hall committed Nov 28, 2017
  7f60dcb2 Browse Files
- Merge pull request #16677 from edx/aali/OPS-2476_update_requiremnts · d1757fdf
```
added redis version
```
  syed-awais-ali committed Nov 28, 2017
  d1757fdf Browse Files
- edx-enterprise version upgrade to 0.53.18 · 61a163fc
  Saleem Latif committed Nov 28, 2017
  
  61a163fc Browse Files
27 Nov, 2017 19 commits
- Merge remote-tracking branch 'upstream/master' into… · 0decade2
```
Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip]
```
  Jose Antonio Gonzlez committed Nov 27, 2017
  0decade2 Browse Files
- Course Highlights Setting in Studio Course Outline · 9f74e705
```
fixup! trying to "fix" underscore syntax error

add cancel modal test

Fix quality issues.

Apply Nimisha's suggestions for my quality fixes.

Skip test_drop_unit_in_collapsed_subsection

Fix quality error
```
  Tyler Hallada committed Nov 27, 2017
  9f74e705 Browse Files
- Updated course_has_highlights and get_week_highlights. Methods ensure that a… · 13edb0b0
```
Updated course_has_highlights and get_week_highlights. Methods ensure that a course has highlights_enabled_for_messaging

Responded to Nimisha's review feedback.
```
  sandroroux committed Nov 27, 2017
  13edb0b0 Browse Files
- Merge pull request #16633 from edx/sofiya/ed-1560 · ea488f84
```
Educator 1560 - Clean up labelling in the Discussion Add Post form
```
  Sofiya Semenova committed Nov 27, 2017
  ea488f84 Browse Files
- Merge pull request #16605 from mikix/mikix/border-a11y · ffc83825
```
Show current tab even in high contrast mode
```
  Michael Terry committed Nov 27, 2017
  ffc83825 Browse Files
- Merge pull request #16641 from mikix/mikix/button-a11y · 20154a76
```
Fix focus loss when bookmarking a page in IE
```
  Michael Terry committed Nov 27, 2017
  20154a76 Browse Files
- 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
- Educator 1560 - Clean up labelling in the Discussion Add Post form · 3244fc0d
  Sofiya Semenova committed Nov 27, 2017
  
  3244fc0d 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
- added redis version · 375190f4
  syed-awais-ali committed Nov 27, 2017
  
  375190f4 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 4 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