Commits · d8a8d7957db49e1a2fbf50095cc9f2dda4bb5018 · edx / edx-platform

28 Jul, 2017 2 commits
- Merge pull request #15686 from edx/andya/openedx-i18n · d8a8d795
```
Collect translation strings from the openedx folder
```
  Andy Armstrong committed Jul 28, 2017
  d8a8d795 Browse Files
- Merge pull request #15643 from edx/andya/site-theme-preview · d247fe63
```
Implement theme admin UI to support previewing
```
  Andy Armstrong committed Jul 27, 2017
  d247fe63 Browse Files
27 Jul, 2017 17 commits
- Collect translation strings from the openedx folder · 8a7947c8
```
LEARNER-2112
```
  Andy Armstrong committed Jul 27, 2017
  8a7947c8 Browse Files
- Implement theme admin UI to support previewing · 0f808cec
```
LEARNER-2017
```
  Andy Armstrong committed Jul 27, 2017
  0f808cec Browse Files
- Merge pull request #15675 from edx/ssemenova/ed-9 · 8eb4e469
```
Educator-9 Removed comment about changing warning to exception
```
  Sofiya Semenova committed Jul 27, 2017
  8eb4e469 Browse Files
- Merge pull request #15679 from edx/douglashall/upgrade_enterprise_0_39_1 · af1fa2b6
```
Upgrade edx-enterprise package to 0.39.1.
```
  Douglas Hall committed Jul 27, 2017
  af1fa2b6 Browse Files
- Educator-9 Remove comment · 18bd5320
  Sofiya Semenova committed Jul 27, 2017
  
  18bd5320 Browse Files
- Merge pull request #15674 from edx/jmbowman/PLAT-1590 · c7db5d89
```
PLAT-1590 Fixes for Docker Devstack e2e tests
```
  Jeremy Bowman committed Jul 27, 2017
  c7db5d89 Browse Files
- Merge pull request #15605 from edx/jlajoie/EDUCATOR-842 · 8b24b29a
```
EDUCATOR-842: adds in management command for verified_tracks
```
  Jeff LaJoie committed Jul 27, 2017
  8b24b29a Browse Files
- Merge pull request #15681 from mitodl/pdpinch/bump-edx-sga · 4aa1c4b0
```
bump edx-sga XBlock to v0.6.4
```
  John Eskew committed Jul 27, 2017
  4aa1c4b0 Browse Files
- Merge pull request #15680 from edx/ormsbee/readd_to_bt_cache_on_miss · 7ce1da9c
```
Re-add to BlockStructure cache on miss.
```
  David Ormsbee committed Jul 27, 2017
  7ce1da9c Browse Files
- bumping edx-sga xBlock to 0.6.4 · e461a6a6
  Peter Pinch committed Jul 27, 2017
  
  e461a6a6 Browse Files
- Removed usage of LogoutViewConfiguration · 835cc087
```
This model will soon be deleted.

LEARNER-2042
```
  Clinton Blackburn committed Jul 27, 2017
  835cc087 Browse Files
- EDUCATOR-842: adds in management command to swap a course's xblocks from… · 55649355
```
EDUCATOR-842: adds in management command to swap a course's xblocks from verified track cohorts to enrollment tracks
```
  Jeff LaJoie committed Jul 27, 2017
  55649355 Browse Files
- Re-add to BlockStructure cache on miss. · 39a7c095
```
BlockStructures are stored in S3, but they're cached in memcached. Prior
to this commit, they were only written to memcached when first created.
This commit adds a write to repopulate the cache entry every time there
is a cache miss. Hopefully, this will help reduce the miss rate we're
seeing.
```
  David Ormsbee committed Jul 27, 2017
  39a7c095 Browse Files
- Merge pull request #15668 from edx/tuchfarber/WL-1140 · 2d0fc911
```
Make HTTP 500 error pages site-aware
```
  Matt Tuchfarber committed Jul 27, 2017
  2d0fc911 Browse Files
- Merge pull request #15538 from potsui/fix-duplicate-account-crash · 5fca0521
```
Catch exception with duplicate username/email
```
  George Song committed Jul 27, 2017
  5fca0521 Browse Files
- Merge pull request #15677 from edx/HarryRein/WL-1147-image-swap · ce474444
```
Fixing whitelabel messaging issue.
```
  Harry Rein committed Jul 27, 2017
  ce474444 Browse Files
- Upgrade edx-enterprise package to 0.39.1. · 6e94e371
  Douglas Hall committed Jul 27, 2017
  
  6e94e371 Browse Files
26 Jul, 2017 21 commits
- Fixing whitelabel messaging issue. · 666db5cc
```
WL-1147

Switching edx.org and openedx images.
```
  Harry Rein committed Jul 26, 2017
  666db5cc Browse Files
- Merge pull request #15671 from edx/diana/tabs-issues · 069a9051
```
Handle tab hiding at a different level.
```
  Diana Huang committed Jul 26, 2017
  069a9051 Browse Files
- EDUCATOR-783 | Upgrade to edxval 0.1.0 (supports django 1.11). · 91ad611f
  Alex Dusenbery committed Jul 26, 2017
  
  91ad611f Browse Files
- Change templates to use site aware email · 827c703d
```
Template were using global TECH_SUPPORT_EMAIL for error pages. This
changes them to use the site email if there is one.
```
  Matt Tuchfarber committed Jul 26, 2017
  827c703d Browse Files
- Merge pull request #15673 from edx/efischer/actually_limit_libraries · 562322d7
```
Return no libraries if org not specified
```
  Eric Fischer committed Jul 26, 2017
  562322d7 Browse Files
- Handle tab hiding at a different level. · 482b63ba
  Diana Huang committed Jul 26, 2017
  
  482b63ba Browse Files
- Merge pull request #15665 from edx/bmedx/django_1.11_upgrade_oauth_toolkit_PLAT-1655 · bfb17a76
```
Upgrade django-oauth-toolkit to 0.12.0
```
  Brian Beggs committed Jul 26, 2017
  bfb17a76 Browse Files
- PLAT-1590 Fixes for Docker Devstack e2e tests · 70c0b7bd
  Jeremy Bowman committed Jul 26, 2017
  
  70c0b7bd Browse Files
- Merge pull request #15657 from open-craft/haikuginger/enterprise-from-pipeline · 90a8a17f
```
[ENT-491] Check for Enterprise-linked TPA pipeline when asked for Enterprise on request
```
  Jesse Shapiro committed Jul 26, 2017
  90a8a17f Browse Files
- Return no libraries if org not specified · 2ab2ed77
```
Due to a bug in org=None vs org='', all libraries were being returned
from the "optimization" in #15292. This fix returns no libraries on the
default '' value.
```
  Eric Fischer committed Jul 26, 2017
  2ab2ed77 Browse Files
- Add pipeline check for linked enterprise · 3517c1d9
  Jesse Shapiro committed Jul 26, 2017
  
  3517c1d9 Browse Files
- Merge pull request #15664 from edx/LEARNER-2016 · 5fea8b8b
```
LEARNER-2016 Cannot Track Campaigns to Checkout Page Using UTM Codes
```
  Matthew Piatetsky committed Jul 26, 2017
  5fea8b8b Browse Files
- Merge pull request #15607 from edx/ari/webpack-commons-all-pages · 82bc92b4
```
include webpack commons bundle on all pages
```
  Ari Rizzitano committed Jul 26, 2017
  82bc92b4 Browse Files
- Merge pull request #15654 from edx/tasawer/learner-741/fix-user-drowndown-alignment · 918ca9b5
```
Fixed user dropdown alignment
```
  Tasawer Nawaz committed Jul 26, 2017
  918ca9b5 Browse Files
- Merge pull request #15591 from edx/Learner-1254 · ef9935d2
```
Background color changed for microsoft button in social auth login
```
  hamzamunir7300 committed Jul 26, 2017
  ef9935d2 Browse Files
- include webpack commons bundle on all pages; stub webpack_loader in python unittests · 3d4b2a73
```
include webpack commons bundle on all pages

quotes

homegrown webpack_loader mock

toggle installed webpack_loader in test env file instead

fix test checking context
```
  Ari Rizzitano committed Jul 26, 2017
  3d4b2a73 Browse Files
- Merge pull request #15661 from edx/schen/learner-1521 · 9b15f580
```
Move the user_attribute creation for site 
```
  Simon Chen committed Jul 26, 2017
  9b15f580 Browse Files
- fix for the quality tests failing · 3f9f0781
  Hamza Munir committed Jul 26, 2017
  
  3f9f0781 Browse Files
- Merge pull request #15667 from edx/afzaledx/get_programs_with_type_fix · c96c1c8e
```
Added a missing parameter.
```
  Afzal Wali Naushahi committed Jul 26, 2017
  c96c1c8e Browse Files
- Added a missing parameter. · ec1473f8
  Afzal Wali committed Jul 26, 2017
  
  ec1473f8 Browse Files
- Fixed user dropdown alignment · 840a919a
```
LEARNER-741
```
  tasawernawaz committed Jul 26, 2017
  840a919a Browse Files