Commits · bb219ed4a72e047e55721f0e59312cdbec84d301 · edx / edx-platform · GitLab

12 Jun, 2017 8 commits
- Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates · bb219ed4
  rabia23 committed Jun 12, 2017
  
  bb219ed4 Browse Files
- fix coursekey error · 64845801
  rabia23 committed Jun 12, 2017
  
  64845801 Browse Files
- Merge pull request #15270 from edx/mjevtic/LEARNER-1183 · 484ec256
```
[LEARNER-1183] Prepare program data to be presented on program marketing page
```
  Marko Jevtić committed Jun 12, 2017
  484ec256 Browse Files
- [LEARNER-1183] Prepare program data to be presented on program marketing page · bf164ae9
```
[LEARNER-1393] Filter program course runs by status
```
  Marko Jevtic committed Jun 12, 2017
  bf164ae9 Browse Files
- Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates · b29d1e32
  rabiaiftikhar committed Jun 12, 2017
  
  b29d1e32 Browse Files
- Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates · d12e36e2
  rabiaiftikhar committed Jun 12, 2017
  
  d12e36e2 Browse Files
- Merge pull request #15206 from edx/andya/clean-imports-lms · 9c4869c1
```
Reorder LMS imports using isort
```
  Andy Armstrong committed Jun 11, 2017
  9c4869c1 Browse Files
- Reorder LMS imports using isort · 79acb5c5
  Andy Armstrong committed Jun 11, 2017
  
  79acb5c5 Browse Files
11 Jun, 2017 5 commits
- Updated Course Structure API views to use JWT authentication · 8d4db4ac
```
LEARNER-1375
```
  Clinton Blackburn committed Jun 11, 2017
  8d4db4ac Browse Files
- Updated Commerce API v1 views to use JWT authentication · 0b07b53e
```
LEARNER-1375
```
  Clinton Blackburn committed Jun 11, 2017
  0b07b53e Browse Files
- fix unit and bokchoy tests · b7b86561
  rabia23 committed Jun 11, 2017
  
  b7b86561 Browse Files
- Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates · 642c3b47
  rabia23 committed Jun 11, 2017
  
  642c3b47 Browse Files
- reset self-generation of certs according to course pacing · 955c6447
  rabia23 committed Jun 11, 2017
  
  955c6447 Browse Files
10 Jun, 2017 1 commit
- Merge pull request #15291 from edx/revert-15005-aws_with_filesystem_storage · 5dd2c65c
```
Revert "Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module"
```
  Stu Young committed Jun 10, 2017
  5dd2c65c Browse Files
09 Jun, 2017 12 commits
- Merge pull request #15248 from edx/ibrahimahmed443/LEARNER-1127 · 07dc1e6b
```
Exclude hidden programs from white label course page and home page
```
  Ibrahim Ahmed committed Jun 10, 2017
  07dc1e6b Browse Files
- Revert "Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module" · 8870dde9
  Stu Young committed Jun 09, 2017
  
  8870dde9 Browse Files
- Exclude hidden programs from white label course and homepage · 99957168
```
LEARNER-1126, LEARNER-1127
```
  Ibrahim committed Jun 09, 2017
  99957168 Browse Files
- Merge pull request #15275 from edx/bbeggs/paramiko-1.18.1 · 6643e7e1
```
Remove paramiko requirement
```
  Brian Beggs committed Jun 09, 2017
  6643e7e1 Browse Files
- Merge pull request #15005 from replaceafill/aws_with_filesystem_storage · eb3bbc7c
```
Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module
```
  Kevin Falcone committed Jun 09, 2017
  eb3bbc7c Browse Files
- Merge pull request #13850 from proversity-org/proversity/fix-valid-signature · e31590e5
```
Fix valid signature
```
  Simon Chen committed Jun 09, 2017
  e31590e5 Browse Files
- Merge pull request #15269 from edx/mjevtic/LEARNER-1366 · 53cd05fb
```
LEARNER-1366 EcommerceService should be able to provide a link to the basket page that contains multiple products
```
  Marko Jevtić committed Jun 09, 2017
  53cd05fb Browse Files
- LEARNER-1366 EcommerceService should be able to provide a link to the basket… · 24227286
```
LEARNER-1366 EcommerceService should be able to provide a link to the basket page that contains multiple products
```
  Marko Jevtic committed Jun 09, 2017
  24227286 Browse Files
- Merge pull request #15224 from edx/ai/EDUCATOR-496-date-format · 58c3366f
```
EDUCATOR-496 Display date in correct UTC format.
```
  Attiya Ishaque committed Jun 09, 2017
  58c3366f Browse Files
- EDUCATOR-496 Display date in correct UTC format. · 383d61e0
  attiyaishaque committed Jun 09, 2017
  
  383d61e0 Browse Files
- fix valid signature · e58e295c
  jagonzalr committed Jun 09, 2017
  
  e58e295c Browse Files
- Removed MEDIA_ROOT override in cms.envs.devstack · ca33342c
  Douglas Cerna committed Jun 08, 2017
  
  ca33342c Browse Files
08 Jun, 2017 14 commits
- Merge pull request #15284 from edx/christina/add-middleware-guid · 6a244a3f
```
Synchronous celery tasks clear the request cache
```
  Christina Roberts committed Jun 08, 2017
  6a244a3f Browse Files
- remove paramiko · 9e6e97c0
  Brian Beggs committed Jun 08, 2017
  
  9e6e97c0 Browse Files
- Make the code robust to the request cache being cleared. · d9592fc4
  cahrens committed Jun 08, 2017
  
  d9592fc4 Browse Files
- Merge pull request #15265 from edx/ret/upsell-cookie · 14fed7a7
```
Upgrade course experiment
```
  Calen Pennington committed Jun 08, 2017
  14fed7a7 Browse Files
- Merge pull request #15266 from edx/ssemenova/EDUCATOR-367 · 91f1923d
```
ED-367 log in production logging when it shouldn't be
```
  Sofiya Semenova committed Jun 08, 2017
  91f1923d Browse Files
- Merge pull request #15211 from edx/adam/add-precedes-to-coursegraph-2 · c3a7088a
```
add precedes relationship to coursegraph (EDUCATOR-484)
```
  Adam committed Jun 08, 2017
  c3a7088a Browse Files
- Merge pull request #15279 from edx/christina/add-middleware-guid · 7c9e1172
```
Add GUID to memory middleware logs.
```
  Christina Roberts committed Jun 08, 2017
  7c9e1172 Browse Files
- ED-367 log in production · 6acc6fde
  Sofiya Semenova committed Jun 08, 2017
  
  6acc6fde Browse Files
- Merge pull request #15245 from edx/shrlyhe/ENT-371 · efae2778
```
ENT-371: Add platform name to "Create your account" message
```
  Shirley He committed Jun 08, 2017
  efae2778 Browse Files
- Merge pull request #15278 from edx/mroytman/undo-ES-requirement-change · 205de011
```
revert 15259
```
  Feanil Patel committed Jun 08, 2017
  205de011 Browse Files
- Make test runs less verbose · ede33605
  Calen Pennington committed Jun 08, 2017
  
  ede33605 Browse Files
- Make the upgrade snippet template safe · 975f1e70
  Calen Pennington committed Jun 08, 2017
  
  975f1e70 Browse Files
- Don't buffer test output into memory · fe3f0f54
  Calen Pennington committed Jun 08, 2017
  
  fe3f0f54 Browse Files
- Upsell Courses in Courseware, CourseOutline, Discussions, Progress · fdafd53a
  Nimisha Asthagiri committed Jun 08, 2017
  
  fdafd53a Browse Files