Commit Graph

55357 Commits

Author SHA1 Message Date
Alexander Sheehan
2e2493f99d ENH adding country to SAML mapping config 2020-07-21 16:23:00 -04:00
Feanil Patel
c3180cdea2 DEPR-43 - Remove donation logic from student dashboard. 2020-07-21 15:26:29 -04:00
Calen Pennington
83daf2a1c9 Add tests of ORA2 dates on the dates page 2020-07-21 15:17:51 -04:00
stvn
17340353ea Merge PR #24555 bump/completion
* Commits:
  Bump edx-completion to version 3.2.4
2020-07-21 11:36:25 -07:00
stvn
747d0a2a22 Bump edx-completion to version 3.2.4 2020-07-21 10:53:11 -07:00
Andytr1
af072a5158 EDUCATOR-5039 (#24546)
* EDUCATOR-5039

* EDUCATOR-5039 - pr updates
2020-07-21 13:36:18 -04:00
JJ
9d62bf16b2 [REV-1205] Add upsell tracking to verified/no SKU courses on the dashboard
Add the tracking class to the upsell button on the course dashboard for courses that are verified but have no SKUs so we get better data on when upsell links get clicked.
2020-07-21 13:08:53 -04:00
Alex Wang
9b74414893 Deprecate relevant course fields after the new exam setting is enabled (#24500)
mst-292
2020-07-21 09:18:51 -07:00
Calen Pennington
3e47170470 Revert "Merge pull request #24547 from edx/revert-24503-ora2-dates-reprise"
This reverts commit 21d1f3d5d1, reversing
changes made to 19f82258aa.
2020-07-21 11:54:06 -04:00
Diane Kaplan
72dd144476 [REV-1205] add event tracking for PLS upsell links (#24522)
Co-authored-by: Diane Kaplan <dkaplan@edx.org>
2020-07-21 10:00:39 -04:00
Zachary Hancock
c9f5ec3397 disable escalation email requirement (#24551) 2020-07-21 09:45:25 -04:00
Awais Qureshi
7b639c3da0 Merge pull request #24525 from open-craft/fix-failing-non-indexable-test
[BD-29] [TNL-6993] [BB-2602] Fix failing non-indexable tests
2020-07-21 17:39:23 +05:00
edX cache uploader bot
0713dc3738 Updating Bokchoy testing database cache 2020-07-21 08:16:13 -04:00
adeelehsan
f085e746cc Merge pull request #24495 from edx/aehsan/prod-1911/added_config_model_in_bulk_change_enrollment_command
Config model added to upload csv
2020-07-21 17:10:22 +05:00
adeelehsan
f2e989183c Config model added to upload csv
PROD-1911
2020-07-21 16:19:31 +05:00
uzairr
71b5ef4771 Fix XSS while prepending html 2020-07-21 14:41:24 +05:00
Awais Qureshi
d5f5891ae3 Merge pull request #24553 from edx/jenkins/upgrade-python-requirements-831a6a0
Python Requirements Update
2020-07-21 11:46:32 +05:00
Awais Jibran
de49eb7059 Merge pull request #24549 from edx/update-logs
Updating ProblemClose Log.
2020-07-21 11:23:24 +05:00
edX requirements bot
ada0de992c Updating Python Requirements 2020-07-21 01:24:19 -04:00
stvn
5eaa532046 Fix segment_context key error
This is one of the frequent TNL errors.
2020-07-20 17:26:38 -07:00
Albert (AJ) St. Aubin
831a6a010f Merge pull request #24548 from edx/aj/MICROBA-484
[MICROBA-484] Update the URL for demographics banner
2020-07-20 15:18:07 -04:00
Awais Jibran
0b9087346b Updating ProblemClose Log. 2020-07-20 23:27:09 +05:00
Albert (AJ) St. Aubin
c145c24e73 [MICROBA-484] Update the URL for demographics banner 2020-07-20 14:17:57 -04:00
Calen Pennington
21d1f3d5d1 Merge pull request #24547 from edx/revert-24503-ora2-dates-reprise
Revert "Ora2 dates reprise"
2020-07-20 13:33:13 -04:00
Dillon Dumesnil
75db9b2534 Revert "Ora2 dates reprise" 2020-07-20 09:55:02 -07:00
Binod Pant
19f82258aa ENT-3160 Automate association to customer on SAMLProviderConfig creation (#24519)
* create links ProviderConfig to EnterpriseCustomer

* lint

* remove extraneous print

* don't create samlprovider unless enterprise found, update a test to use valid uuid and fail request

* fix test for correct status code as was intended
2020-07-20 12:35:04 -04:00
Jansen Kantor
bf66c177ff EDUCATOR-5167: Fix Flaky Discussions Test (#24532)
* Revert "Delete flaky test according to process (#24441)"

This reverts commit 87edb542b1.

* fix flaky test, give count assert 1-query tolerance
2020-07-20 10:44:44 -04:00
Calen Pennington
14609d7166 Merge pull request #24503 from cpennington/ora2-dates-reprise
Ora2 dates reprise
2020-07-20 10:25:07 -04:00
M. Zulqarnain
d6be5952e8 Unpin drf-jwt (#24371) 2020-07-20 19:21:12 +05:00
Michael Terry
d1ec276af7 Merge pull request #24517 from edx/mikix/course-handouts
AA-121: add handouts to course home outlines API
2020-07-20 08:55:22 -04:00
Awais Jibran
c90e8231d0 Merge pull request #24540 from edx/aj/bug-fix-capa-ec
bug: fix an edge case in capa problem tolerance
2020-07-20 16:28:27 +05:00
Awais Jibran
5ad10d4555 Update log / problem closed.
PROD-1586
2020-07-20 15:29:18 +05:00
Awais Jibran
e2b60e1c97 bug: fix an edge case in capa problem tolerance
PROD-1586
2020-07-20 15:27:47 +05:00
Ahmad Bilal Khalid
9b01f29ac5 Remove edx-ora2 from requirements/constraints.txt and run make upgrade 2020-07-20 12:11:43 +05:00
Ahmad Bilal Khalid
71bbd9a5ec Fix failing non-indexable tests 2020-07-20 12:06:42 +05:00
Usama Sadiq
71aa3c9d75 Merge pull request #24539 from edx/jenkins/upgrade-python-requirements-d0b1384
Python Requirements Update
2020-07-20 11:20:45 +05:00
edX requirements bot
e9bb69b1d7 Updating Python Requirements 2020-07-20 00:55:33 -04:00
edX Transifex Bot
d0b138479f fix(i18n): update translations 2020-07-19 17:36:28 -04:00
stvn
1189580e0f Merge PR #24521 cleanup/mfe-flags
* Commits:
  Consolidate MFE redirect logic
2020-07-17 11:46:04 -07:00
Matt Tuchfarber
fb6786d90c Merge pull request #24490 from edx/tuchfarber/use_demographics_api_for_banner
Use new demographics API for banner in .org theme
2020-07-17 14:02:55 -04:00
uzairr
fb9ba90efe PROD-1236: Do not expose user id with certificate URL. 2020-07-17 22:59:34 +05:00
Adam Stankiewicz
91dc5e4b9c bump edx-enterprise to 3.3.26 (#24533) 2020-07-17 13:47:59 -04:00
Matt Tuchfarber
cbeab67833 Use demographics api for dashboard banner
Make demographics collection banner on dashboard use new demographics
API which checks enterprise as well. Also expose serialization of
CourseEnrollments.
2020-07-17 13:20:42 -04:00
Aura Milena Alba
64edd0e686 Remove pattern library of learner_achievements. (#24369) 2020-07-17 12:45:58 -04:00
Robert Raposa
ef51a44794 move CodeOwnerMetricMiddleware from LMS (#24508)
The CodeOwnerMetricMiddleware is being moved from
edx-platform to edx-django-utils so it can be used
in multiple IDAs.

ARCHBOM-1356
2020-07-17 11:35:40 -04:00
Eric Herrera
141aba4042 Use updated django-wiki version, OEP-18 compliant and compatible with Python 3.8. 2020-07-17 10:35:11 -04:00
Patrick Cockwell
129ed1b9ab TNL-7303 Add course license details to Courseware API (#24393) 2020-07-17 10:15:21 -04:00
Jeff LaJoie
eb32aa979a Merge pull request #24361 from edx/jlajoie/ENT-2893
ENT-2893: Updates header branding and href for Enterprise learners
2020-07-17 09:58:09 -04:00
Michael Terry
a160744c7e AA-121: add handouts to course home outlines API
This will let the learning MFE render the course handouts
2020-07-17 09:25:54 -04:00
Jeff LaJoie
bf11b68fda ENT-2893: Updates header branding and href for Enterprise learners 2020-07-17 08:59:43 -04:00