Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,097 Commits 1 Branch 0 Tags
adffb10cbe67bbafe654944519cc92f796dbaced
Commit Graph

33097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alison Hodges
adffb10cbe Updates the description provided for a new enrollment report 
https://github.com/edx/edx-platform/pull/9345
 2015-10-01 16:28:42 -04:00
chrisndodge
d9a21d72fc Merge pull request #9945 from edx/cdodge/credit-status-messaging 
Make the message to the end user consistent across as requirement typ…
 2015-09-30 12:40:59 -04:00
David Baumgold
3f6e39054e Merge pull request #9955 from edx/partially-revert-comprehensive-theming 
Remove the edx.org comprehensive theme
 2015-09-30 12:17:22 -04:00
David Baumgold
7cd9db1216 Disable some tests for comprehensive theming 
Depends on functionality that has been temporarily reverted
 2015-09-30 11:33:41 -04:00
Muzaffar yousaf
e6068ec491 Merge pull request #9973 from edx/muzaffar/upgrade-django-filter 
Upgrade django-filter.
 2015-09-30 20:20:21 +05:00
Christine Lytwynec
d3fefa5978 Merge pull request #9866 from edx/clytwynec/update-bokchoy 
Update bok-choy version to v0.4.5
 2015-09-30 11:17:07 -04:00
David Baumgold
116ca29189 Remove the edx.org comprehensive theme 
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.
 2015-09-30 11:04:28 -04:00
Peter Fogg
999c5d8c70 Merge pull request #9961 from edx/peter-fogg/add-ecommerce-service-user 
Reserve ecommerce service username on edx-platform.
 2015-09-30 10:45:48 -04:00
Christine Lytwynec
9387b60746 skip test_can_delete_unused_content_group due to flakiness 2015-09-30 10:12:54 -04:00
Christine Lytwynec
b84f35349a update bok-choy version to v0.4.5 2015-09-30 10:12:54 -04:00
David Baumgold
1fe37195b3 Merge pull request #9900 from edx/i18n-course-browse-copy 
i18n course browse copy
 2015-09-30 09:48:21 -04:00
Sarina Canelake
b64130a644 Merge pull request #9972 from edx/sarina/upgrade-transifex 
Update transifex-client requirement to latest release version
 2015-09-30 09:44:58 -04:00
muzaffaryousaf
77cdf85c61 Upgrade django-filter. 
TNL-3445
 2015-09-30 18:25:32 +05:00
Sarina Canelake
be59984d06 Update transifex-client requirement to latest release version 2015-09-30 08:53:50 -04:00
Awais Qureshi
c486f857ca Merge pull request #9881 from edx/awais786/ECOM-1988-upgrade-msg-with-credit-mode 
Hide upgrade message on student dashboard for credit enrollments
 2015-09-30 12:51:38 +05:00
Chris Dodge
799571b213 Make the message to the end user consistent across as requirement types, except for grade requirements 2015-09-29 22:24:59 -04:00
Peter Fogg
448f4d51e6 Reserve ecommerce service username on edx-platform. 2015-09-29 17:29:55 -04:00
Clinton Blackburn
84e56ed8cb Merge pull request #9956 from edx/clintonb/receipt-fix 
Fixed receipt page bug
 2015-09-29 17:20:12 -04:00
Clinton Blackburn
6f22fc07f6 Fixed receipt page bug 
Variable name was broken by a commit in #9868.

ECOM-2431
 2015-09-29 17:19:26 -04:00
Ned Batchelder
7b435e603b Merge pull request #9953 from edx/ned/drf-data-change 
DRF 3.1 now uses request.data instead of request.DATA
 2015-09-29 16:21:20 -04:00
Ned Batchelder
5d94ec9133 Merge pull request #9921 from edx/ned/summarize-test-results 
A script to summarize nosetests.xml files
 2015-09-29 15:46:18 -04:00
Ned Batchelder
817347f7d3 Merge pull request #9939 from edx/ned/fix-broken-mocks 
Added autospec=True to mocks being used incorrectly.
 2015-09-29 15:44:56 -04:00
Ned Batchelder
8ec2de9359 DRF 3.1 now uses request.data instead of request.DATA 2015-09-29 15:25:55 -04:00
Cliff Dyer
e21ddabe4f Merge pull request #9951 from edx/cdyer/add-me-to-authors 
Added myself to the AUTHORS file
 2015-09-29 15:11:01 -04:00
J. Cliff Dyer
678a71993b Added myself to the AUTHORS file 2015-09-29 18:06:10 +00:00
frances botsford
be0b70bd06 Merge pull request #9910 from edx/frances/invalid-cert-styles 
Styles and content adjustments for invalid cert view
 2015-09-29 12:23:25 -04:00
Awais
0ca586f65b If enrollment mode is credit then upgrade message should not appear. 
Fixing certificates for credit mode.
ECOM-1988
 2015-09-29 20:56:32 +05:00
David Baumgold
c781d035bf Merge pull request #9913 from edx/doc-remove-repetition 
Don't repeat the word 'standard'
 2015-09-29 11:50:50 -04:00
Adam
b2f1855e53 Merge pull request #9943 from edx/revert-9760-mushtaq/tnl3252-fix-mathjax-rendering 
Revert "Fix Mathjax rendering bug"
 2015-09-29 11:37:58 -04:00
Frances Botsford
28d09a7233 styles and content adjustments for invalid cert view 2015-09-29 11:30:48 -04:00
Matt Drayer
e0c430ffe3 Merge pull request #9941 from edx/ziafazal/MAYN-138 
MAYN-138: Rebranding Help tab didn't work
 2015-09-29 10:35:40 -04:00
Bill DeRusha
a6873cb883 Merge pull request #9875 from edx/bderusha/segment-cleanup 
Segment Clean Up
 2015-09-29 10:33:03 -04:00
Bill DeRusha
14e1ef13fe Merge pull request #9865 from edx/bderusha/segment-version-bump 
Bump version of segemnt's analytics-python package to 1.1.0
 2015-09-29 09:33:49 -04:00
Calen Pennington
64f3229ce0 Fix tests revealed to be in error by autospec. 2015-09-29 09:30:38 -04:00
Adam
e8b1608f16 Revert "Fix Mathjax rendering bug" 2015-09-29 09:26:59 -04:00
Brian Beggs
a4c99964cc Merge pull request #9937 from edx/bbeggs/2015-09-22-release-to-master 
Merge patch/2015-09-22 (Django rest framework) to master
 2015-09-29 09:24:01 -04:00
Matt Drayer
d3c50ee3a2 Merge pull request #9884 from edx/saleem-latif/SOL-1190 
SOL-1190: line breaks in signatory title are not reflected in the cert
 2015-09-29 08:50:25 -04:00
Matt Drayer
b12d6c8371 Merge pull request #9938 from edx/saleem-latif/MAYN-131-follow-on 
reverting the changes sent in PR#9925
 2015-09-29 08:48:16 -04:00
Zia Fazal
604ac8504c use platform_name template tag 2015-09-29 17:01:55 +05:00
Ned Batchelder
60c2e45fbc Added autospec=True to mocks being used incorrectly. 
The tests now fail!
 2015-09-29 06:56:30 -04:00
Saleem Latif
d91aa83af5 reverting the chnages sent in MAYN-131, final solution will be submitted in a separate PR 2015-09-29 14:03:19 +05:00
Saleem Latif
abfa6d9ad1 Line breaks in signatory title issue fixed 2015-09-29 12:38:58 +05:00
Brian Beggs
14d7a7525b fixed PEP-8 violations 2015-09-28 21:42:28 -04:00
Brian Beggs
cc73bc0b61 added test to discussions_api client to test JSON response that is absent of the resp_total key 2015-09-28 21:03:19 -04:00
Brian Beggs
d9de52751d Merge remote-tracking branch 'origin/release' into bbeggs/2015-09-22-release-to-master 2015-09-28 20:58:34 -04:00
Ben Patterson
cebc4ae0f8 Merge pull request #9936 from edx/revert-9929-bbeggs/merge-DRF-3.1 
Revert "Merge DRF 3.1 in to master"
 2015-09-28 19:19:19 -04:00
Ben Patterson
2fd6add524 Revert "Merge DRF 3.1 in to master" 2015-09-28 17:12:43 -04:00
Brian Beggs
00473d44ac Merge pull request #9929 from edx/bbeggs/merge-DRF-3.1 
Merge DRF 3.1 in to master
 2015-09-28 11:56:18 -04:00
Brian Beggs
53524efbd8 Fixes for rebasing of the release on 2015-09-23 2015-09-28 11:52:33 -04:00
Will Daly
322db6de7a TNL-3316: Error on Insights performance report 
Preserve DRF v2 behavior of defaulting to None
for missing keys in the grading policy dictionary.
 2015-09-28 11:52:32 -04:00