Commit Graph

4808 Commits

Author SHA1 Message Date
David Ormsbee
7c9f4a2533 Merge pull request #21178 from edx/ormsbee/remove_dashbaord_cookie_reset
Remove user cookie reset on Student Dashboard.
2019-07-22 10:40:42 -04:00
Ayub
16c7227c07 Merge pull request #21068 from edx/INCR-403
INCR-403 python3 compatibility
2019-07-22 14:52:04 +05:00
Ayub
560da82837 Merge pull request #21067 from edx/INCR-402
INCR-402 python3 compatibility
2019-07-22 14:47:18 +05:00
David Ormsbee
0f51b58f75 Remove user cookie reset on Student Dashboard.
The enrollmentStatusHash cookie value was created in commit f0030334
as an optimization, in order to determine whether the marketing site
needs to refresh the list of a student's enrolled courses with a
call to the LMS. To ensure that this value was kept up to date,
commit d7a7bcc1 reset the user's cookies every time they go to the
learner dashboard page (which used to be the next page loaded after
you enrolled in a course). This didn't just reset the
enrollmentStatusHash though -- it recalculated all the cookie
values, as if you had just logged in.

A number of things have changed since then:

1. Enrolling in a course now goes to that course's info/navigation
   page, rather than going to the student dashboard.
2. It doesn't appear that the value of enrollmentStatusHash is
   actually being examined anywhere -- it's set in a cookie on the
   LMS and read/written by the edX marketing front end code, but
   the value is never looked at to make any decisions.
3. The introduction of add_email_marketing_cookies (which triggers
   off of the CREATE_LOGON_COOKIE signal) has made cookie resets
   far more expensive, as there is a blocking call to Sailthru if
   you have that enabled in EmailMarketingConfiguration (which
   edx.org does). This can add over two seconds to the server
   processing time for the student dashboard at certain times of
   day.

Given this, I'm removing both the call to resetting the cookie on
the student dashboard page, as well as setting the value for
enrollmentStatusHash.
2019-07-21 20:16:19 -04:00
Uzair Rasheed
eed0dfbbe4 Merge pull request #21149 from edx/PROD-305/add-credit-mode-enrollment
Add credit mode in support enrollment tool.
2019-07-21 00:45:52 +05:00
aarif
ccff822a28 ran python-modernize and isort on files mentioned in INCR-396 2019-07-19 10:04:05 -04:00
Ayub khan
83bc838fae python 3 compatibility 2019-07-19 10:02:38 -04:00
Ayub khan
33bcb76a26 INCR-400 python3 compatibility 2019-07-19 10:00:39 -04:00
Feanil Patel
d1556fc86d md5 needs bytes in python 3 but a sting is fine in python2. 2019-07-19 09:48:10 -04:00
uzairr
07821927e2 Add credit modein support enrollment tool.
Currently, enrollment support tool is only allowing support members
to change course enrollment only one of the two modes i.e. audit and
verified.To move a learner other than these modes,they need to ping
devops.To broaden the scope of enrollment support tool,changes have
been done so that enrollment would be changed to other modes as well.

PROD-305
2019-07-19 18:14:35 +05:00
Awais Qureshi
3ed1399216 Merge pull request #21065 from edx/awais786/INCR-398
INCR-398
2019-07-19 11:33:43 +05:00
Awais Qureshi
af50c3c043 Merge pull request #21063 from edx/awais786/INCR-397
INCR-397
2019-07-18 14:34:43 +05:00
Awais Qureshi
8b278f3ac2 Merge pull request #21062 from edx/awais786/INCR-395
INCR-395
2019-07-18 12:19:30 +05:00
Awais Qureshi
288195e1be Merge pull request #21060 from edx/awais786/INCR-394
INCR-394
2019-07-18 12:15:37 +05:00
David Ormsbee
a712f1f93b Remove full table scan of VerificationDeadline. (#21119)
* Remove full table scan of VerificationDeadline.

Before this commit, we were doing a full table scan of
student_verificationdeadline, loading the results into a giant
dict, and reading/writing that to the cache. This was fine when the
code was introduced and there were dozens of courses, but now that
we're over 12K courses, it's becoming a major performance issue for
the Student Dashboard.

This uses a subquery to the course enrollment table so that we're
only ever pulling back the deadlines to a student's enrolled courses
for any given request. It removes the cache access entirely.
2019-07-17 10:25:08 -04:00
Matt Tuchfarber
b1998e202e Merge pull request #20945 from edx/tuchfarber/remove_journals
Remove all references to Journals
2019-07-11 11:08:24 -04:00
Amit
0044bef4fd INCR-393: Updates on Python 3.x (#21054) 2019-07-11 10:21:47 -04:00
Ayub khan
102dca6ae6 INCR-403 python3 compatibility 2019-07-11 14:45:01 +05:00
Ayub khan
6661745e77 INCR-402 python3 compatibility 2019-07-11 14:42:14 +05:00
arbisoft
e87dc6cc77 Fixing python-modernize issues. 2019-07-11 14:24:38 +05:00
arbisoft
004d856316 Fixing python-modernize issues. 2019-07-11 14:04:05 +05:00
arbisoft
c82b0110b0 Fixing python-modernize issues. 2019-07-11 13:37:11 +05:00
arbisoft
503622c5d2 Fixing python-modernize issues. 2019-07-11 12:59:47 +05:00
Matt Tuchfarber
2583d317db Remove all references to Journals 2019-07-09 14:19:25 -04:00
arbisoft
ebcd75965b python3 compatibilty 2019-07-08 16:25:58 +05:00
Zainab Amir
f6603cb8cf Update verification expiry email criteria (#20725)
If already DEFAULT Number of emails are sent, then verify that user
is enrolled in at least one verified course run for which the course
has not ended else stop sending emails

LEARNER-7313
2019-07-03 14:19:22 +05:00
emma-green
7f467075ad Merge pull request #20916 from edx/emma-green/remove-discount-banner-display-flag
remove discount banner display flag
2019-07-01 10:38:42 -04:00
Emma Green
c4ae093e75 remove discount banner display flag 2019-06-28 14:46:21 -04:00
adeelehsan
2d369490dd Flag added to load limited courses on Dashboard
Dashboard is set to load 250 courses instead of
all the courses. A flag is also added to change
the number the courses to load.

PROD-204
2019-06-28 22:51:41 +05:00
Calen Pennington
39efc54a27 Merge pull request #20884 from cpennington/discount-no-previous-purchase
REVEM-289: Discount no previous purchase
2019-06-25 17:12:19 -04:00
Ned Batchelder
aa13a634a6 Merge pull request #20821 from edx/nedbat/drf-yasg
Upgrade djangorestframework and install drf-yasg to get better OpenAPI support
2019-06-25 13:49:13 -04:00
Calen Pennington
390122ec93 Make CourseOverviewFactory create new courses every time (unless otherwise specified) 2019-06-25 12:04:59 -04:00
Christie Rice
b8401beaae REVEM-374 Remove course prices from dashboard (#20856) 2019-06-24 08:56:05 -04:00
Ned Batchelder
b3a731550c Fix problems that drf-yasg uncovered.
These were originally fixed individually, but had to be reverted, and
are now combined in one commit.  The originals were:

7b9040f6b0 This enum was backwards
8774ff1f9b Use ref_name to disambiguate serializers that drf-yasg would otherwise assume are the same.
8a44397139 Is this field missing because it is None?
4a1154a7ca Give a safer buffer for clearing the rate limiting
64c47856dd DRF 3.7.4 changed how you delegate to another view, so don't
7359ca4fb2 Is this right? It fixes two tests
fdd66e5390 Adjust the expected error message for DRF 3.7.7
9257f68fd8 The default TIME_ZONE should be UTC
2019-06-21 18:04:15 -04:00
Calen Pennington
e37e7e67fb Add metrics and logging around track selection rendering without enrollment 2019-06-21 13:15:14 -04:00
Hassan Javeed
6d14f288e5 Added history to CourseMode
DE-1557
2019-06-20 19:04:26 +05:00
Diana Huang
fe3d33091f More test fixes. 2019-06-14 15:20:50 -04:00
Michael Roytman
05c0510cd3 add external_user_key to response and add ability to search by username, email, or external user key
Code review comments - EDUCATOR-4319

undoing changes temporarily

undoing changes temporarily

Fixed exception handling

re-added changes after hard reset

removed waffle flag (wrong merge

removed waffle flag (wrong merge
2019-06-14 08:36:00 -04:00
Ned Batchelder
39c7a2db7c Revert "Use drf-yasg for Open API documentation" 2019-06-11 16:05:00 -04:00
Jeremy Bowman
237d264a50 DEPR-12 Remove microsites references from edxmako (#20796) 2019-06-11 15:27:10 -04:00
Ned Batchelder
756dd88691 Merge pull request #20393 from edx/nedbat/drf-yasg
Use drf-yasg for Open API documentation
2019-06-11 13:58:13 -04:00
edx-pipeline-bot
de5d25eccc Merge pull request #20794 from edx/private_to_public_55dd3e1
Mergeback PR from private to public.
2019-06-11 19:17:13 +05:00
Ned Batchelder
8774ff1f9b Use ref_name to disambiguate serializers that drf-yasg would otherwise assume are the same. 2019-06-10 15:27:39 -04:00
Ned Batchelder
8a44397139 Is this field missing because it is None? 2019-06-10 15:27:39 -04:00
Matthew Piatetsky
aba836b517 Merge pull request #20674 from edx/REVEM-354
add discount banner to track selection and discount price to upgrade button
2019-06-07 11:35:34 -04:00
Thomas Tracy
f0ecc938ef Add IdentityServer3 Backend (#20275)
* Add IdentityServer3 Backend

This adds a backend for users who want to use IdentityServer3 as their
SSO provider. It can be used with the OAuth2ProviderConfig in django
admin to point to an external provider.
2019-06-07 09:38:46 -04:00
Josue Balandrano Coronel
df14f5cdf6 [BB-1132] Decrease NAME_MIN_LENGTH to 1 2019-06-06 22:52:00 +02:00
Matthew Piatetsky
ce5b976f5e update local currency code 2019-06-05 15:46:16 -04:00
David Ormsbee
74492907d8 Merge pull request #19582 from open-craft/josuebc/upstream/BB-732
BB-732 Fix Django admin form for Course Enrollment
2019-06-04 18:21:53 -04:00
Troy Sankey
df8f581d36 Add history to CourseEntitlement
DE-1510
2019-06-04 13:52:17 -04:00