Commits · c2420b0940976cd7619bcd0df0e0593ba9e8949d · edx / edx-platform · GitLab

15 Jul, 2015 2 commits
- Final tweaks to API documentation updates · c2420b09
  Sylvia Pearce committed Jul 15, 2015
  
  c2420b09 Browse Files
- Reorganize and update API documentation · d2b6ac84
  Sylvia Pearce committed Jul 15, 2015
  
  d2b6ac84 Browse Files
09 Jul, 2015 9 commits
- Merge pull request #8776 from edx/ahsan/ECOM-1578-Credit-Payment-Dashboard-States-update · 3cdad467
```
Credit Payment - Dashboard States
```
  Ahsan Ulhaq committed Jul 09, 2015
  3cdad467 Browse Files
- Merge pull request #8816 from mitocw/bdero/fix-paver-run-all · e0b90f3f
```
Fix the Paver run_all_servers method.
```
  Andy Armstrong committed Jul 09, 2015
  e0b90f3f Browse Files
- Merge pull request #8842 from edx/sarina/upgrade-django · 5489e038
```
Upgrade Django 1.4 to the latest point release
```
  Sarina Canelake committed Jul 09, 2015
  5489e038 Browse Files
- Merge pull request #8846 from edx/zub/story/add-credit-provider-description · 1e380815
```
add 'provider_description' field for CreditProvider model
```
  zubair-arbi committed Jul 09, 2015
  1e380815 Browse Files
- Credit Payment - Dashboard States · c94f043c
```
ECOM-1578
```
  Ahsan Ulhaq committed Jul 09, 2015
  c94f043c Browse Files
- add 'provider_description' field for CreditProvider model · 71ce4d07
```
ECOM-1842
```
  zubair-arbi committed Jul 09, 2015
  71ce4d07 Browse Files
- Merge pull request #8795 from edx/zub/story/ecom-1815-update-creditprovider-model · 8a65167d
```
add 'fulfillment_instructions' for 'CreditProvider' model
```
  zubair-arbi committed Jul 09, 2015
  8a65167d Browse Files
- Merge pull request #8817 from edx/zub/story/ecom-1648-update-credit-eligibility-ui-text · db82cbde
```
update credit eligibility ui text
```
  zubair-arbi committed Jul 09, 2015
  db82cbde Browse Files
- Merge pull request #8771 from edx/clintonb/currency-comparison-fix · cd60dd56
```
Comparing currencies with same case
```
  Clinton Blackburn committed Jul 09, 2015
  cd60dd56 Browse Files
08 Jul, 2015 29 commits
- Merge pull request #8716 from edx/ahodges/staff_labeling · 747c6b74
```
Ahodges/staff labeling
```
  Alison Hodges committed Jul 08, 2015
  747c6b74 Browse Files
- Upgrade Django 1.4 to the latest point release · 9fcd8ffa
  Sarina Canelake committed Jul 08, 2015
  
  9fcd8ffa Browse Files
- Revert "edX Course/Library Import/Export API" · 2bfbda3c
```
This reverts commit c94abd27.
```
  Brandon DeRosier committed Jul 08, 2015
  2bfbda3c Browse Files
- Revert "Add feature flag for Import/Export API in LMS" · 783e83de
```
This reverts commit 85b3bfe4.
```
  Brandon DeRosier committed Jul 08, 2015
  783e83de Browse Files
- Cherrypick hotfix-2015-07-07 into release candidate · e60ae31d
```
Includes the changes from 897fddba.
Those changes were introduced while resolving a merge
conflict from release back into master.
```
  Will Daly committed Jul 08, 2015
  e60ae31d Browse Files
- rc/2015-07-08-mattdrayer: Hide button behind feature flag · b0c1e962
  Matt Drayer committed Jul 08, 2015
  
  b0c1e962 Browse Files
- Corrected path to Commerce API · b3437b72
```
XCOM-312
```
  Clinton Blackburn committed Jul 08, 2015
  b3437b72 Browse Files
- ECOM-1829 Removing the regen link. · db7dea11
  Awais committed Jul 08, 2015
  
  db7dea11 Browse Files
- Fix migrations 0012 and 0013 in the credit app · 4b64df74
```
Adds the "order" field that was introduced in 0011 to the "models"
dictionary of migrations 0012 and 0013 so South knows that
the field should exist after 0011 is run.
```
  Will Daly committed Jul 08, 2015
  4b64df74 Browse Files
- Merge pull request #8826 from edx/will/fix-progress-credit-typo · 1ee782ce
```
Fix a small typo for credit requirements on the progress page.
```
  Will Daly committed Jul 08, 2015
  1ee782ce Browse Files
- Merge pull request #8828 from edx/db/remove-unused-gems · 146742ba
```
Remove unused Ruby gems
```
  David Baumgold committed Jul 08, 2015
  146742ba Browse Files
- Fix a small typo for credit requirements on the progress page. · 9056052b
  Will Daly committed Jul 08, 2015
  
  9056052b Browse Files
- Merge pull request #8735 from edx/mushtaq/plat633-delete-case · ab60b110
```
Fix 'stuck in publish issue' when deleting a component
```
  Mushtaq Ali committed Jul 08, 2015
  ab60b110 Browse Files
- Merge pull request #8815 from open-craft/hinted-login-fix · d07a2798
```
Fix hinted login view to be compatible with secondary providers.
```
  Braden MacDonald committed Jul 08, 2015
  d07a2798 Browse Files
- Merge pull request #8823 from edx/clee/add-better-email-message-in-release-script · ea36fcac
```
Added more descripted release script message
```
  Christopher Lee committed Jul 08, 2015
  ea36fcac Browse Files
- Remove unused Ruby gems · ccd60234
```
These were only used by rake, and we haven't used rake in a year.
```
  David Baumgold committed Jul 08, 2015
  ccd60234 Browse Files
- Merge pull request #8822 from edx/benmcmorran/taiwan-fix · 9e5290c1
```
TNL-2665 Prevent Taiwan from being translated
```
  Ben McMorran committed Jul 08, 2015
  9e5290c1 Browse Files
- Merge pull request #8642 from edx/mekkz/course-overviews-dashboard · afa77db9
```
Update LMS student dashboard to use CourseOverview
```
  Kyle McCormick committed Jul 08, 2015
  afa77db9 Browse Files
- Merge pull request #8824 from edx/zoldak/TNL-1475 · 7b33b73a
```
Disable flaky GroupConfigurationsPage JS test TNL-1475
```
  Jesse Zoldak committed Jul 08, 2015
  7b33b73a Browse Files
- Merge pull request #8827 from edx/revert-8818-tasawer/story/ecom-1651-on-demand-cert-download · 25434a03
```
Revert "Update copy for On Demand Cert Download"
```
  Ben Patterson committed Jul 08, 2015
  25434a03 Browse Files
- Added more descripted release script message · 080450d5
  christopher lee committed Jul 08, 2015
  
  080450d5 Browse Files
- MA-779 Update student dashboard to use CourseOverview · 1dfe9ed9
  Kyle McCormick committed Jul 08, 2015
  
  1dfe9ed9 Browse Files
- MA-779 Make has_access work on CourseOverview objects · 5b630a77
  Kyle McCormick committed Jul 08, 2015
  
  5b630a77 Browse Files
- Disable flaky GroupConfigurationsPage JS test TNL-1475 · a11275ee
  Jesse Zoldak committed Jul 08, 2015
  
  a11275ee Browse Files
- Merge pull request #8818 from edx/tasawer/story/ecom-1651-on-demand-cert-download · c64d58f2
```
Update copy for On Demand Cert Download
```
  tasawernawaz committed Jul 08, 2015
  c64d58f2 Browse Files
- Merge pull request #8811 from edx/zoldak/fix-flaky-js-tests · a118fd96
```
Fix flaky js tests caused by ajax requests TE-970
```
  Jesse Zoldak committed Jul 08, 2015
  a118fd96 Browse Files
- Merge branch 'master' of github.com:edx/edx-platform · 658519d0
  Ned Batchelder committed Jul 08, 2015
  
  658519d0 Browse Files
- Fix a pep8 violation · ac6ab5da
  Ned Batchelder committed Jul 08, 2015
  
  ac6ab5da Browse Files
- update credit eligibility ui text · ab74f64e
```
ECOM-1648
```
  zubair-arbi committed Jul 08, 2015
  ab74f64e Browse Files