Commits · 34820aba24e76d29864441733cd80b99ff2945f7 · edx / edx-platform · GitLab

06 Oct, 2015 1 commit
- Add Video File Size Warning to Upload Template · 34820aba
  Mark Hoeber committed Oct 06, 2015
  
  34820aba Browse Files
01 Oct, 2015 5 commits
- Merge pull request #9982 from edx/muzaffar/DRF-change-query-params · 772b0bff
```
DRF uses query_params instead of QUERY_PARAMS.
```
  Muzaffar yousaf committed Oct 01, 2015
  772b0bff Browse Files
- Merge pull request #9952 from edx/ahsan/ECOM-2338-Messaging-and-text-improvements · 74d668ec
```
Messaging and text improvements dashboard
```
  Ahsan Ulhaq committed Oct 01, 2015
  74d668ec Browse Files
- Messaging and text improvements · 65b8bf8c
```
ECOM-2338
```
  Ahsan Ulhaq committed Oct 01, 2015
  65b8bf8c Browse Files
- Merge pull request #9993 from edx/add-folsom · 062e979e
```
Add myself to AUTHORS
```
  Sarina Canelake committed Sep 30, 2015
  062e979e Browse Files
- Add myself to AUTHORS · 20bfec76
  Jamie Folsom committed Sep 30, 2015
  
  20bfec76 Browse Files
30 Sep, 2015 21 commits
- Merge pull request #9985 from edx/clytwynec/html-fixes · 4aceb33c
```
fix typo in course_info.html
```
  Christine Lytwynec committed Sep 30, 2015
  4aceb33c Browse Files
- Merge pull request #9395 from edx/asadiqbal08/MAYN-116 · 220fb3df
```
asadiqbal08/MAYN-116 Including GTM code from microsite
```
  Matt Drayer committed Sep 30, 2015
  220fb3df Browse Files
- fix typo in course_info.html · 90b9a737
  Christine Lytwynec committed Sep 30, 2015
  
  90b9a737 Browse Files
- MAYN-116 Including GTM code from microsite · df83c87e
  asadiqbal committed Sep 30, 2015
  
  df83c87e Browse Files
- Merge pull request #9806 from edx/ziafazal/SOL-1185 · 65831c88
```
ziafazal/SOL-1185: move SOCIAL_SHARING_SETTINGS out of FEATURES
```
  Matt Drayer committed Sep 30, 2015
  65831c88 Browse Files
- 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
- DRF uses query_params instead of QUERY_PARAMS. · b2ebb680
```
TNL-3442
```
  muzaffaryousaf committed Sep 30, 2015
  b2ebb680 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 13 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