Commits · d9a21d72fcfa3e437ce381337d51bb79f80d7a84 · edx / edx-platform · GitLab

30 Sep, 2015 15 commits
- Merge pull request #9945 from edx/cdodge/credit-status-messaging · d9a21d72
```
Make the message to the end user consistent across as requirement typ…
```
  chrisndodge committed Sep 30, 2015
  d9a21d72 Browse Files
- Merge pull request #9955 from edx/partially-revert-comprehensive-theming · 3f6e3905
```
Remove the edx.org comprehensive theme
```
  David Baumgold committed Sep 30, 2015
  3f6e3905 Browse Files
- Disable some tests for comprehensive theming · 7cd9db12
```
Depends on functionality that has been temporarily reverted
```
  David Baumgold committed Sep 30, 2015
  7cd9db12 Browse Files
- Merge pull request #9973 from edx/muzaffar/upgrade-django-filter · e6068ec4
```
Upgrade django-filter.
```
  Muzaffar yousaf committed Sep 30, 2015
  e6068ec4 Browse Files
- Merge pull request #9866 from edx/clytwynec/update-bokchoy · d3fefa59
```
Update bok-choy version to v0.4.5
```
  Christine Lytwynec committed Sep 30, 2015
  d3fefa59 Browse Files
- Remove the edx.org comprehensive theme · 116ca291
```
There's a lot of useful things in PR #8271 that provide a framework
for the comprehensive theming system. If we need to remove the edx.org
theme from the codebase, we can leave most of PR #8271 in, to make it
easier to build on top of and get this feature back in.
```
  David Baumgold committed Sep 30, 2015
  116ca291 Browse Files
- Merge pull request #9961 from edx/peter-fogg/add-ecommerce-service-user · 999c5d8c
```
Reserve ecommerce service username on edx-platform.
```
  Peter Fogg committed Sep 30, 2015
  999c5d8c Browse Files
- skip test_can_delete_unused_content_group due to flakiness · 9387b607
  Christine Lytwynec committed Sep 30, 2015
  
  9387b607 Browse Files
- update bok-choy version to v0.4.5 · b84f3534
  Christine Lytwynec committed Sep 30, 2015
  
  b84f3534 Browse Files
- Merge pull request #9900 from edx/i18n-course-browse-copy · 1fe37195
```
i18n course browse copy
```
  David Baumgold committed Sep 30, 2015
  1fe37195 Browse Files
- Merge pull request #9972 from edx/sarina/upgrade-transifex · b64130a6
```
Update transifex-client requirement to latest release version
```
  Sarina Canelake committed Sep 30, 2015
  b64130a6 Browse Files
- Upgrade django-filter. · 77cdf85c
```
TNL-3445
```
  muzaffaryousaf committed Sep 30, 2015
  77cdf85c Browse Files
- Update transifex-client requirement to latest release version · be59984d
  Sarina Canelake committed Sep 30, 2015
  
  be59984d Browse Files
- Merge pull request #9881 from edx/awais786/ECOM-1988-upgrade-msg-with-credit-mode · c486f857
```
Hide upgrade message on student dashboard for credit enrollments
```
  Awais Qureshi committed Sep 30, 2015
  c486f857 Browse Files
- Make the message to the end user consistent across as requirement types, except… · 799571b2
```
Make the message to the end user consistent across as requirement types, except for grade requirements
```
  Chris Dodge committed Sep 29, 2015
  799571b2 Browse Files
29 Sep, 2015 25 commits
- Reserve ecommerce service username on edx-platform. · 448f4d51
  Peter Fogg committed Sep 29, 2015
  
  448f4d51 Browse Files
- Merge pull request #9956 from edx/clintonb/receipt-fix · 84e56ed8
```
Fixed receipt page bug
```
  Clinton Blackburn committed Sep 29, 2015
  84e56ed8 Browse Files
- Fixed receipt page bug · 6f22fc07
```
Variable name was broken by a commit in #9868.

ECOM-2431
```
  Clinton Blackburn committed Sep 29, 2015
  6f22fc07 Browse Files
- Merge pull request #9953 from edx/ned/drf-data-change · 7b435e60
```
DRF 3.1 now uses request.data instead of request.DATA
```
  Ned Batchelder committed Sep 29, 2015
  7b435e60 Browse Files
- Merge pull request #9921 from edx/ned/summarize-test-results · 5d94ec91
```
A script to summarize nosetests.xml files
```
  Ned Batchelder committed Sep 29, 2015
  5d94ec91 Browse Files
- Merge pull request #9939 from edx/ned/fix-broken-mocks · 817347f7
```
Added autospec=True to mocks being used incorrectly.
```
  Ned Batchelder committed Sep 29, 2015
  817347f7 Browse Files
- DRF 3.1 now uses request.data instead of request.DATA · 8ec2de93
  Ned Batchelder committed Sep 29, 2015
  
  8ec2de93 Browse Files
- Merge pull request #9951 from edx/cdyer/add-me-to-authors · e21ddabe
```
Added myself to the AUTHORS file
```
  Cliff Dyer committed Sep 29, 2015
  e21ddabe Browse Files
- Added myself to the AUTHORS file · 678a7199
  J. Cliff Dyer committed Sep 29, 2015
  
  678a7199 Browse Files
- Merge pull request #9910 from edx/frances/invalid-cert-styles · be0b70bd
```
Styles and content adjustments for invalid cert view
```
  frances botsford committed Sep 29, 2015
  be0b70bd Browse Files
- If enrollment mode is credit then upgrade message should not appear. · 0ca586f6
```
Fixing certificates for credit mode.
ECOM-1988
```
  Awais committed Sep 29, 2015
  0ca586f6 Browse Files
- Merge pull request #9913 from edx/doc-remove-repetition · c781d035
```
Don't repeat the word 'standard'
```
  David Baumgold committed Sep 29, 2015
  c781d035 Browse Files
- Merge pull request #9943 from edx/revert-9760-mushtaq/tnl3252-fix-mathjax-rendering · b2f1855e
```
Revert "Fix Mathjax rendering bug"
```
  Adam committed Sep 29, 2015
  b2f1855e Browse Files
- styles and content adjustments for invalid cert view · 28d09a72
  Frances Botsford committed Sep 29, 2015
  
  28d09a72 Browse Files
- Merge pull request #9941 from edx/ziafazal/MAYN-138 · e0c430ff
```
MAYN-138: Rebranding Help tab didn't work
```
  Matt Drayer committed Sep 29, 2015
  e0c430ff Browse Files
- Merge pull request #9875 from edx/bderusha/segment-cleanup · a6873cb8
```
Segment Clean Up
```
  Bill DeRusha committed Sep 29, 2015
  a6873cb8 Browse Files
- Merge pull request #9865 from edx/bderusha/segment-version-bump · 14e1ef13
```
Bump version of segemnt's analytics-python package to 1.1.0
```
  Bill DeRusha committed Sep 29, 2015
  14e1ef13 Browse Files
- Fix tests revealed to be in error by autospec. · 64f3229c
  Calen Pennington committed Sep 29, 2015
  
  64f3229c Browse Files
- Revert "Fix Mathjax rendering bug" · e8b1608f
  Adam committed Sep 29, 2015
  
  e8b1608f Browse Files
- Merge pull request #9937 from edx/bbeggs/2015-09-22-release-to-master · a4c99964
```
Merge patch/2015-09-22 (Django rest framework) to master
```
  Brian Beggs committed Sep 29, 2015
  a4c99964 Browse Files
- Merge pull request #9884 from edx/saleem-latif/SOL-1190 · d3c50ee3
```
SOL-1190: line breaks in signatory title are not reflected in the cert
```
  Matt Drayer committed Sep 29, 2015
  d3c50ee3 Browse Files
- Merge pull request #9938 from edx/saleem-latif/MAYN-131-follow-on · b12d6c83
```
reverting the changes sent in PR#9925
```
  Matt Drayer committed Sep 29, 2015
  b12d6c83 Browse Files
- use platform_name template tag · 604ac850
  Zia Fazal committed Sep 29, 2015
  
  604ac850 Browse Files
- Added autospec=True to mocks being used incorrectly. · 60c2e45f
```
The tests now fail!
```
  Ned Batchelder committed Sep 29, 2015
  60c2e45f Browse Files
- reverting the chnages sent in MAYN-131, final solution will be submitted in a separate PR · d91aa83a
  Saleem Latif committed Sep 29, 2015
  
  d91aa83a Browse Files