Commits · 65bcc50e9b144657a49ef727d42d6a548518cd9a · edx / edx-platform · GitLab

05 Jun, 2015 11 commits
- 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 29 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
- Merge pull request #8339 from edx/peter-fogg/teams-header · a9187e81
```
Implement teams header component
```
  Peter Fogg committed Jun 04, 2015
  a9187e81 Browse Files
- Merge pull request #8369 from edx/hotfix-2015-06-03-redux · b58f0b4d
```
Fixed Recommender XBlock uploads
```
  Piotr Mitros committed Jun 04, 2015
  b58f0b4d Browse Files
- handle more exceptions for file uploading · ea8aa99a
  swdanielli committed Jun 04, 2015
  
  ea8aa99a Browse Files
- Merge pull request #8325 from beardeer/master · 4f458392
```
Merge pull request #8325 from beardeer/edx-platform
```
  Xiaolu Xiong committed Jun 04, 2015
  4f458392 Browse Files
- Merge pull request #8336 from edx/dan-f/expose-edxnotes-interface-setting · 8dfb7745
```
Add support for public/internal edx-notes-api endpoints
```
  Daniel Friedman committed Jun 04, 2015
  8dfb7745 Browse Files
- Merge pull request #8349 from edx/adam/fix-capa-devstack · 5952906e
```
disable contracts that were breaking capa problems on devstack (TNL-2…
```
  Adam committed Jun 04, 2015
  5952906e Browse Files
- TNL-1900 Implement teams header component · ebafdb1d
  Peter Fogg committed Jun 04, 2015
  
  ebafdb1d Browse Files
- Add thread editing to discussion API · 73d89131
```
This is done via PATCH on a thread instance endpoint.
```
  Greg Price committed Jun 04, 2015
  73d89131 Browse Files
- Merge pull request #8356 from edx/jsa/xcom-388 · 373d948c
```
Add tests for enrollment deactivation under various modes.
```
  Jim Abramson committed Jun 04, 2015
  373d948c Browse Files
- Merge pull request #8351 from edx/learners-dont-need-to-be-lean · 32749a66
```
Learners don't need to be lean
```
  David Baumgold committed Jun 04, 2015
  32749a66 Browse Files
- Merge pull request #8322 from cpennington/document-read-metrics · 7c0709ce
```
Add metrics around all split-mongo database operations measuring coun…
```
  Calen Pennington committed Jun 04, 2015
  7c0709ce Browse Files
- Learners don't need to be lean · 37064cf1
  David Baumgold committed Jun 04, 2015
  
  37064cf1 Browse Files
- Add tests for enrollment deactivation under various modes. · 445a0c93
```
A bug with the creation of inactive honor enrollment modes was caught and fixed along the way.

XCOM-388
```
  jsa committed Jun 04, 2015
  445a0c93 Browse Files
- Merge pull request #8348 from edx/release-2015-06-02-conflict · 8f016414
```
Release 2015 06 02 conflict
```
  Kevin Falcone committed Jun 04, 2015
  8f016414 Browse Files
- add Xiaolu's name · a4b4e274
  Xiaolu Xiong committed Jun 04, 2015
  
  a4b4e274 Browse Files
- Change the misleading doc string (str doesn't has attr 'name' ) · aa1bca6b
  Xiaolu Xiong committed Jun 04, 2015
  
  aa1bca6b Browse Files
- Merge pull request #8359 from edx/colinfredricks/doc-2044 · 1c148407
```
Fixing typo in default numerical problem
```
  Sarina Canelake committed Jun 04, 2015
  1c148407 Browse Files