Commits · 75531b2fef4835201d26e04befe154e25eead384 · edx / edx-platform · GitLab

23 Jun, 2017 9 commits
- [LEARNER-437] Reflect discount on the Program About Page (WL) · 75531b2f
  Marko Jevtic committed Jun 23, 2017
  
  75531b2f Browse Files
- Merge pull request #15295 from edx/mjevtic/LEARNER-1367 · 5a919f2c
```
[LEARNER-1367] Move Program Marketing page from private themes repo to edx platform repo
```
  Marko Jevtić committed Jun 23, 2017
  5a919f2c Browse Files
- [LEARNER-1367] Move Program Marketing page from private themes repo to edx platform repo · d48100d3
```
[LEARNER-311] Enable a purchase button on the Program page - platform (WL)
```
  Marko Jevtic committed Jun 23, 2017
  d48100d3 Browse Files
- Merge pull request #15396 from edx/bbeggs/dummy · b68a4814
```
Revert "Test out DRF 3.6"
```
  Brian Beggs committed Jun 23, 2017
  b68a4814 Browse Files
- Revert "Test out DRF 3.6" · e25553b6
```
This reverts commit f8d3f889.
```
  Brian Beggs committed Jun 23, 2017
  e25553b6 Browse Files
- Test out DRF 3.6 · f8d3f889
  Brian Beggs committed Jun 23, 2017
  
  f8d3f889 Browse Files
- Merge pull request #15385 from edx/ammar/fix-video-flaky-test · 4622b24a
```
fix video flaky test
```
  Muhammad Ammar committed Jun 23, 2017
  4622b24a Browse Files
- fix video flaky test · 4d609f80
```
EDUCATOR-607
```
  muhammad-ammar committed Jun 23, 2017
  4d609f80 Browse Files
- Merge pull request #15182 from edx/diana/dismiss-button · b2663002
```
Add a dismiss button to welcome message.
```
  Andy Armstrong committed Jun 22, 2017
  b2663002 Browse Files
22 Jun, 2017 5 commits
- Add a dismiss button to welcome message. · 3d09290c
```
Store user's preference indefinitely.
```
  Diana Huang committed Jun 22, 2017
  3d09290c Browse Files
- Merge pull request #15358 from edx/LEARNER-1312b · 72fb9722
```
LEARNER-1312 Track Selection Choice (v2)
```
  Matthew Piatetsky committed Jun 22, 2017
  72fb9722 Browse Files
- Create test for new version of track selection page · 5c7e67e9
```
LEARNER-1312
```
  Matthew Piatetsky committed Jun 22, 2017
  5c7e67e9 Browse Files
- Merge pull request #15354 from edx/jmbowman/PLAT-1228 · 03e724c0
```
PLAT-1228 Support bok-choy in Docker Devstack
```
  Brian Beggs committed Jun 22, 2017
  03e724c0 Browse Files
- PLAT-1228 Support bok-choy in Docker Devstack · 5a6b8cd3
  Jeremy Bowman committed Jun 22, 2017
  
  5a6b8cd3 Browse Files
21 Jun, 2017 12 commits
- Merge pull request #15381 from edx/bexline/fix_enterprise_catalog_api · 1ad2b66e
```
Increments the enterprise version to include a change that will restore
```
  Brittney Exline committed Jun 21, 2017
  1ad2b66e Browse Files
- Increments the enterprise version to include a change that will restore · d80be3ad
```
the ability to create clients for the catalog api.
```
  Brittney Exline committed Jun 21, 2017
  d80be3ad Browse Files
- Have TestWelcomeMessageView runs succeed deterministically when test order is shuffled. · f7f6ac15
  Alex Dusenbery committed Jun 21, 2017
  
  f7f6ac15 Browse Files
- Merge pull request #15377 from edx/efischer/ora2_1.4.3 · b1e3a454
```
edx-ora2 update
```
  Eric Fischer committed Jun 21, 2017
  b1e3a454 Browse Files
- Merge pull request #15376 from edx/douglashall/edx-enteprise_0_36_2 · 7b52767f
```
Upgrading edx-enteprise package to 0.36.2
```
  Douglas Hall committed Jun 21, 2017
  7b52767f Browse Files
- edx-ora2 update · 582e71e8
  Eric Fischer committed Jun 21, 2017
  
  582e71e8 Browse Files
- EDUCATOR-514 | Add certificate_available_date field to CourseFields · fb36c7df
  Alex Dusenbery committed Jun 21, 2017
  
  fb36c7df Browse Files
- Merge pull request #15374 from edx/nedbat/update-translations · 89831f06
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Jun 21, 2017
  89831f06 Browse Files
- Update translations (autogenerated message) · 8dab3712
  Ned Batchelder committed Jun 21, 2017
  
  8dab3712 Browse Files
- Upgrading edx-enteprise package to 0.36.2 · f5758e00
  Douglas Hall committed Jun 21, 2017
  
  f5758e00 Browse Files
- Merge pull request #15180 from edx/clintonb/multi-tenant-catalog-integration · 2b4fb4fd
```
Updated CatalogIntegration to use a site-specific URL
```
  Afzal Wali Naushahi committed Jun 21, 2017
  2b4fb4fd Browse Files
- Taking the url change behind the waffle switch. Required for the Learner-1146 · 8173182c
```
Learner-1111
```
  Afzal Wali committed Jun 21, 2017
  8173182c Browse Files
20 Jun, 2017 14 commits
- Displaying verification denial reasons on dashboard · dd1f8346
```
Learners now see (on the dashboard) a list of reasons why their verifications were denied.

LEARNER-1486
```
  Clinton Blackburn committed Jun 20, 2017
  dd1f8346 Browse Files
- Merge pull request #15135 from open-craft/uman/OC-2606 · f5769959
```
[ENT-365] Move from python-social-auth to split social
```
  Jesse Shapiro committed Jun 20, 2017
  f5769959 Browse Files
- EDUCATOR-333: Grade each course subsection exactly once; ensure that our… · eb73057d
```
EDUCATOR-333: Grade each course subsection exactly once; ensure that our stashed, unsaved subsection grades are unique.
```
  Alex Dusenbery committed Jun 20, 2017
  eb73057d Browse Files
- Merge pull request #15357 from edx/jeskew/django1.11_future_templates_PLAT_1562 · fd86e1b4
```
Use standard 'url' templatetag - deprecated/removed from future.
```
  John Eskew committed Jun 20, 2017
  fd86e1b4 Browse Files
- Merge pull request #15327 from edx/sarahkf/python-template · 2b81a940
```
fixed CC logo text alternative
```
  sarahkf committed Jun 20, 2017
  2b81a940 Browse Files
- Merge pull request #15326 from edx/sarahkf/ARIA-roles · dc121e54
```
fixed aria-label to just say legal
```
  sarahkf committed Jun 20, 2017
  dc121e54 Browse Files
- Migrate to latest, split python-social-auth. · 8b65ca17
```
PSA was monolothic, now split, with new features, like
a DB-backed partial pipeline. FB OAuth2 version also upped.

Partial pipelines don't get cleared except when necessary.
They persist for special cases like change of browser while
still mid-pipeline (i.e. email validation step).

Refactor, cleanup, and update of a lot of small things as well.

PLEASE NOTE the new `social_auth_partial` table.
```
  Uman Shahzad committed Jun 20, 2017
  8b65ca17 Browse Files
- Merge pull request #15370 from edx/douglashall/edx-enteprise_0_35_2 · 4dd4f979
```
Upgrading the edx-enterprise package to 0.35.2.
```
  Douglas Hall committed Jun 20, 2017
  4dd4f979 Browse Files
- Merge pull request #15298 from edx/sofiya/preregister-cohorts · bf577fff
```
Assign users to cohorts before registration
```
  Sofiya Semenova committed Jun 20, 2017
  bf577fff Browse Files
- Truncate title in thread created event to 1000 chars · c22aecea
```
EDUCATOR-341
```
  Kyle McCormick committed Jun 20, 2017
  c22aecea Browse Files
- Upgrading the edx-enterprise package to 0.35.2. · f58277cc
  Douglas Hall committed Jun 20, 2017
  
  f58277cc Browse Files
- Fixed legal aria-label to be a valid label · 540af5ed
```
AC-596

fixed aria-label to just say legal

translate legal label
```
  Sarah Fischmann committed Jun 20, 2017
  540af5ed Browse Files
- Merge pull request #15281 from edx/nedbat/footer-edx-link · 03c725ef
```
edx.org link for Open edX footer
```
  Ned Batchelder committed Jun 20, 2017
  03c725ef Browse Files
- Merge pull request #15367 from edx/efischer/celeryutils_pypi_fun_times · 84aa4a26
```
edx-celeryutils 0.2.4
```
  Eric Fischer committed Jun 20, 2017
  84aa4a26 Browse Files