Commits · e488896f2f7cb8a8a43096f5b0b24a19cce99c48 · edx / edx-platform · GitLab

08 Jun, 2015 9 commits
- Merge pull request #8409 from edx/dsego/SOL-875 · e488896f
```
Update edx-search dependency to reference latest edx-search
```
  Feanil Patel committed Jun 08, 2015
  e488896f Browse Files
- Update github.txt to use a tag instead of a commit · 924bbe6b
  Feanil Patel committed Jun 08, 2015
  
  924bbe6b Browse Files
- Merge pull request #8403 from edx/sarina/remove-redefine-django14-cors · c9796b83
```
Use Django 1.4 @ensure_csrf_cookie method PLAT-664
```
  Sarina Canelake committed Jun 08, 2015
  c9796b83 Browse Files
- Merge pull request #8406 from antoviaque/badges-migration-fix · 688d6229
```
Default to filestorage when S3 isn't configured (aws.py) - SOL-963
```
  Xavier Antoviaque committed Jun 08, 2015
  688d6229 Browse Files
- Merge pull request #8344 from cpennington/update-xblock-repo · 69799cc1
```
Update XBlock dependency to use the merged commit from the edx repo
```
  Calen Pennington committed Jun 08, 2015
  69799cc1 Browse Files
- update edx-search commit reference · 40e89e6c
  Davorin Sego committed Jun 08, 2015
  
  40e89e6c Browse Files
- Default to filestorage when S3 isn't configured (aws.py) · b32629d6
```
Also moves the default icons to the badges subfolder to avoid storage conflicts.
```
  Xavier Antoviaque committed Jun 08, 2015
  b32629d6 Browse Files
- Merge pull request #8385 from edx/asadiqbal08/SOL-961 · fd737d4d
```
(WIP) SOL-961 Student Generated Certificate Flow  shows "download" certificate
```
  Matt Drayer committed Jun 07, 2015
  fd737d4d Browse Files
- asadiqbal08/SOL-961: Student-generated certificate flow shows "download" certificate button · 6f0606a0
  asadiqbal committed Jun 07, 2015
  
  6f0606a0 Browse Files
07 Jun, 2015 6 commits
- Merge pull request #8386 from edx/benp/lint-fix-test_import_export · f37fdaf4
```
Follow imports order guidelines.
```
  Ben Patterson committed Jun 07, 2015
  f37fdaf4 Browse Files
- Merge pull request #8404 from edx/benp/skip-settings-test-jun2015 · dc4b4f90
```
Skip test that has become too flaky. SOL-449.
```
  Ben Patterson committed Jun 07, 2015
  dc4b4f90 Browse Files
- Merge pull request #8398 from edx/jibsheet/release-script-updates · 82f7238f
```
www.stage.edx.org is our Drupal site
```
  Kevin Falcone committed Jun 07, 2015
  82f7238f Browse Files
- Skip test that has become too flaky. SOL-449. · d3f7bdc1
  Ben Patterson committed Jun 07, 2015
  
  d3f7bdc1 Browse Files
- Merge pull request #8378 from edx/mattdrayer/SOL-947 · 96c09f6b
```
mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns
```
  Matt Drayer committed Jun 07, 2015
  96c09f6b Browse Files
- mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns · 3e52b8fa
  Matt Drayer committed Jun 06, 2015
  
  3e52b8fa Browse Files
06 Jun, 2015 5 commits
- Merge pull request #8399 from open-craft/fix-badging-name · c8b87179
```
Fix self-paced badge naming.
```
  Kelketek committed Jun 06, 2015
  c8b87179 Browse Files
- Fix self-paced badge naming. · eba951fe
  Jonathan Piacenti committed Jun 06, 2015
  
  eba951fe Browse Files
- Use Django 1.4 @ensure_csrf_cookie method PLAT-664 · e53b9c83
  Sarina Canelake committed Jun 06, 2015
  
  e53b9c83 Browse Files
- Merge pull request #8394 from edx/gprice/discussion-api-vote-thread · c5dc84f8
```
Add thread voting to discussion API
```
  Greg Price committed Jun 05, 2015
  c5dc84f8 Browse Files
- Merge pull request #8393 from edx/sylvia/docs/ECommerceTabUI · 6b40a6e2
```
Change name of section from Sales to Course Seat Purchases
```
  chrisndodge committed Jun 05, 2015
  6b40a6e2 Browse Files
05 Jun, 2015 20 commits
- Add thread voting to discussion API · 37ebbc45
  Greg Price committed Jun 05, 2015
  
  37ebbc45 Browse Files
- Merge pull request #8392 from edx/sarina/20150605-update-translations · 53e2f2ee
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Jun 05, 2015
  53e2f2ee Browse Files
- Merge pull request #8372 from edx/gprice/discussion-api-follow-thread · 6c2df96c
```
Add ability to follow a thread in discussion API
```
  Greg Price committed Jun 05, 2015
  6c2df96c Browse Files
- Change name of section from Sales to Course Seat Purchases · eabc4c24
  Sylvia Pearce committed Jun 05, 2015
  
  eabc4c24 Browse Files
- Merge pull request #8345 from edx/adam/time-imports · ef5cd63c
```
time how long imports take in datadog
```
  Adam committed Jun 05, 2015
  ef5cd63c Browse Files
- Update translations (autogenerated message) · c6456704
  Sarina Canelake committed Jun 05, 2015
  
  c6456704 Browse Files
- Add ability to follow a thread in discussion API · 9ff87497
  Greg Price committed Jun 05, 2015
  
  9ff87497 Browse Files
- Merge pull request #8240 from edx/mobile/render_xblock · 65bcc50e
```
MA-722 Render xBlock API
```
  Nimisha Asthagiri committed Jun 05, 2015
  65bcc50e Browse Files
- MA-722 Render xBlock API Support · d240785b
  Nimisha Asthagiri committed Jun 05, 2015
  
  d240785b Browse Files
- Follow imports order guidelines. · b7f8bd3c
```
https://github.com/edx/edx-platform/wiki/Python-Guidelines#imports-order

Follow-up to #8368
```
  Ben Patterson committed Jun 05, 2015
  b7f8bd3c Browse Files
- Merge pull request #8381 from edx/benp/flaky-milestones-jun2015 · 8d1651cc
```
Flag test as flaky. SOL-449
```
  Ben Patterson committed Jun 05, 2015
  8d1651cc Browse Files
- Merge pull request #8368 from edx/benp/flag-flaky-import-export · 03c01590
```
Flag test as flaky.
```
  Ben Patterson committed Jun 05, 2015
  03c01590 Browse Files
- Merge pull request #8374 from edx/alasdair/ECOM-1684-new-footer-style-updates · c820ae14
```
ECOM-1684 updated footer styles in line with Marketing requests
```
  AlasdairSwan committed Jun 05, 2015
  c820ae14 Browse Files
- Merge pull request #8230 from edx/ahsan/ECOM-1555-Set-up-Credit-Provider-model · db36c443
```
Set up Credit Provider Model
```
  Ahsan Ulhaq committed Jun 05, 2015
  db36c443 Browse Files
- Set up Credit Provider Model · 5f74a140
```
Update credit Provider model and register in admin

ECOM-1555
```
  Ahsan Ulhaq committed Jun 05, 2015
  5f74a140 Browse Files
- www.stage.edx.org is our Drupal site · 4a24363c
```
It also serves the production SSL cert (*.edx.org) meaning people who
visit www.stage.edx.org get an SSL error.  Send them to stage.edx.org
instead.
```
  Kevin Falcone committed Jun 04, 2015
  4a24363c Browse Files
- Merge pull request #8361 from edx/asadiqbal08/SOL-946 · 60b73b48
```
SOL-946
```
  Matt Drayer committed Jun 04, 2015
  60b73b48 Browse Files
- Merge pull request #8371 from edx/mattdrayer/SOL-953 · dc5f6503
```
mattdrayer/SOL-953: Remove Mako UNDEFINED overrides
```
  Matt Drayer committed Jun 04, 2015
  dc5f6503 Browse Files
- Merge pull request #8376 from edx/release · ec088193
```
Merge release to master
```
  Greg Price committed Jun 04, 2015
  ec088193 Browse Files
- Flag test as flaky. SOL-449 · 4e39799f
  Ben Patterson committed Jun 04, 2015
  
  4e39799f Browse Files