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

12459 Commits

Author SHA1 Message Date
Sarina Canelake
972196fe3f Merge pull request #9978 from mitocw/fix/gs/min_count_keyerror 
Fixed KeyError in CCX
 2015-10-01 15:43:28 -04:00
Sarina Canelake
cdd59b5a10 Merge pull request #9950 from lduarte1991/lti-allow-fullscreen 
Allow fullscreen within lti
 2015-10-01 15:42:15 -04:00
David Baumgold
69bc10235e Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts 2015-10-01 15:28:55 -04:00
Peter Fogg
c67bcaefc5 Merge pull request #9948 from edx/peter-fogg/fix-team-membership-count 
Fix displaying wrong membership on "My Team" view.
 2015-10-01 12:51:32 -04:00
Peter Fogg
ffe2aef41e Fix displaying wrong membership on "My Team" view. 
The heart of this fix is to change the "My Team" view to use a
collection of teams instead of memberships. The team card is
refactored to only take a team, rather than attempt to be polymorphic
over teams and team memberships. This change enabled removing a good
amount of old code. This also requires adding a `username` parameter
to the teams list endpoint which allows getting a list of all teams
for a single user, in order to allow refreshing the "My Teams" view
correctly. Currently this list is of length at most one.

TNL-3410
 2015-10-01 11:56:15 -04:00
Ben Patterson
82b199b64f Merge pull request #9908 from edx/benp/flaky-pythontest-sep2015 
Flag test as flaky.
 2015-10-01 11:23:16 -04:00
George Schneeloch
c6c92230c5 Fixed min_count KeyError 2015-10-01 10:56:13 -04:00
Matt Drayer
7557620d59 Merge pull request #9967 from edx/ziafazal/SOL-1247 
SOL-1247: use overridden course number and org
 2015-10-01 10:10:13 -04:00
Zia Fazal
fcb3a64f1d use overridden course number and org 
renamed test's name
 2015-10-01 18:22:09 +05:00
Muzaffar yousaf
772b0bff31 Merge pull request #9982 from edx/muzaffar/DRF-change-query-params 
DRF uses query_params instead of QUERY_PARAMS.
 2015-10-01 15:38:33 +05:00
Ahsan Ulhaq
65b8bf8c40 Messaging and text improvements 
ECOM-2338
 2015-10-01 12:41:56 +05:00
asadiqbal
df83c87e60 MAYN-116 Including GTM code from microsite 2015-09-30 14:36:34 -04:00
Matt Drayer
65831c887d Merge pull request #9806 from edx/ziafazal/SOL-1185 
ziafazal/SOL-1185: move SOCIAL_SHARING_SETTINGS out of FEATURES
 2015-09-30 14:12:33 -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
chrisndodge
cc15a9ada8 Merge pull request #9975 from edx/cdodge/bump-proctoring 
update reference to edx-proctoring to account for requested iconograp…
 2015-09-30 12:38:31 -04:00
David Baumgold
459f2e0705 Disable some tests for comprehensive theming 
Depends on functionality that has been temporarily reverted
 2015-09-30 12:18:09 -04:00
David Baumgold
aa8ecca536 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 12:18:01 -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
muzaffaryousaf
b2ebb680de DRF uses query_params instead of QUERY_PARAMS. 
TNL-3442
 2015-09-30 20:45:40 +05: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
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
Chris Dodge
bf26b09265 update reference to edx-proctoring to account for requested iconography changes from UX team. Also update test to conform with changes 2015-09-30 10:10:23 -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
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
8ec2de9359 DRF 3.1 now uses request.data instead of request.DATA 2015-09-29 15:25:55 -04:00
lduarte1991
196f6ef64b Allow fullscreen within lti 2015-09-29 13:02:10 -04: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
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
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
Zia Fazal
604ac8504c use platform_name template tag 2015-09-29 17:01:55 +05: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
2fd6add524 Revert "Merge DRF 3.1 in to master" 2015-09-28 17:12:43 -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
Will Daly
d11ccad0fc Upgrade djangorestframework to v3.1 
* Upgrade edx-submissions
* Upgrade edx-ora2
* Upgrade edx-val
* Upgrade edx-proctoring
* Update all edx-platform code that depends on DRF, including:
  - auth_exchange
  - cors_csrf
  - embargo
  - enrollment
  - util
  - commerce
  - course_structure
  - discussion_api
  - mobile_api
  - notifier_api
  - teams
  - credit
  - profile_images
  - user_api
  - lib/api (OAuth2 and pagination)
 2015-09-28 11:52:30 -04:00
David Baumgold
78f8fc39e8 Merge pull request #9922 from edx/cdodge/proctoring-2015-10-01 
bump version of edx-proctoring to 0.9.11
 2015-09-28 11:37:11 -04:00