Commits · 4a93d531c169e611f34a309da798d5b80b478f17 · edx / edx-platform · GitLab

09 Jun, 2015 2 commits
- Merge pull request #8436 from edx/waheed/tnl2122-fix-download-transcript-error-youtube-server · 4a93d531
```
transcript name param url
```
  Adam committed Jun 09, 2015
  4a93d531 Browse Files
- transcript name param url · ecc3473d
  Syed Hassan Raza committed Jun 09, 2015
  
  ecc3473d Browse Files
08 Jun, 2015 8 commits
- Merge pull request #8405 from edx/cdodge/feature-flag-course-search-on-courses-page · de5e12d9
```
make courses.html also honor the ENABLE_COURSE_DISCOVERY feature flag
```
  chrisndodge committed Jun 08, 2015
  de5e12d9 Browse Files
- Merge pull request #8414 from edx/jsa/fix-deactivate-enrollment · a7ebe17d
```
Jsa/fix deactivate enrollment
```
  Jim Abramson committed Jun 08, 2015
  a7ebe17d Browse Files
- Merge pull request #8408 from edx/release · d0f7a08c
```
Release
```
  Adam committed Jun 08, 2015
  d0f7a08c Browse Files
- Merge pull request #8413 from edx/diana/fix-allow-multiple · a02b242e
```
Allow multiple external_link tabs for one course.
```
  Diana Huang committed Jun 08, 2015
  a02b242e Browse Files
- don’t trigger a refund request in otto, if otto requested unenrollment. · f4b2c197
```
XCOM-396
```
  jsa committed Jun 08, 2015
  f4b2c197 Browse Files
- Correct deactivation logic in enrollment api and test. · 445d0dab
```
XCOM-396
```
  jsa committed Jun 08, 2015
  445d0dab Browse Files
- Allow multiple external_link tabs for one course. · a224d06a
  Diana Huang committed Jun 08, 2015
  
  a224d06a Browse Files
- make courses.html also honor the ENABLE_COURSE_DISCOVERY feature flag · e47c97b4
  Chris Dodge committed Jun 08, 2015
  
  e47c97b4 Browse Files
05 Jun, 2015 18 commits
- Merge pull request #8390 from edx/hotfix/2015-06-05 · f91764ab
```
Fixed youtube video was not loading even youtube is available.
```
  Adam committed Jun 05, 2015
  f91764ab 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
- 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
- Fixed youtube video was not loading even youtube is available. · f9fe00ff
```
TNL-2361
```
  Waheed Ahmed committed Jun 05, 2015
  f9fe00ff 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
- 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
- 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
04 Jun, 2015 12 commits
- Flag test as flaky. TNL-2386 · 8e37e68c
  Ben Patterson committed Jun 04, 2015
  
  8e37e68c Browse Files
- Merge pull request #8326 from edx/sylvia/docs/SOL_ECOM · d4b99561
```
Sylvia/docs/sol ecom
```
  srpearce committed Jun 04, 2015
  d4b99561 Browse Files
- mattdrayer/SOL-953: Remove Mako UNDEFINED overrides · 803a73fd
  Matt Drayer committed Jun 04, 2015
  
  803a73fd Browse Files
- asadiqbal08/SOL-946: Remove default value for course title override · 815e4080
  asadiqbal committed Jun 04, 2015
  
  815e4080 Browse Files
- Merge pull request #8167 from itsjeyd/tim/TNL-1652 · 44dfecf7
```
Instructor Dashboard: Add functionality for obtaining list of students who may enroll in a course but haven't signed up yet
```
  Sarina Canelake committed Jun 04, 2015
  44dfecf7 Browse Files
- Merge pull request #8365 from edx/hotfix/2015-06-04 · 399bcc28
```
Enable VAL URLs even when mobile API is disabled
```
  Greg Price committed Jun 04, 2015
  399bcc28 Browse Files
- ECOM-1684 updated footer styles in line with Marketing requests · a819f5f3
  AlasdairSwan committed Jun 04, 2015
  
  a819f5f3 Browse Files
- TNL-1652: Allow instructors to obtain CSV file listing students who may · f711a32e
```
enroll in a course but have not signed up yet.
```
  Tim Krones committed Jun 04, 2015
  f711a32e Browse Files
- Merge pull request #8311 from edx/gprice/discussion-api-edit-thread · 298ba727
```
Add thread editing to discussion API
```
  Greg Price committed Jun 04, 2015
  298ba727 Browse Files
- Enable VAL URLs even when mobile API is disabled · 59f72b55
```
JIRA: MA-799
```
  Greg Price committed Jun 04, 2015
  59f72b55 Browse Files
- Merge pull request #8370 from edx/sarina/add-tim · bdd51e67
```
Add Tim Krones to AUTHORS.
```
  Sarina Canelake committed Jun 04, 2015
  bdd51e67 Browse Files
- Add Tim Krones to AUTHORS. · b590a627
  Tim Krones committed Jun 04, 2015
  
  b590a627 Browse Files