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

4796 Commits

Author SHA1 Message Date
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
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
Matthew Piatetsky
ad77392f8d add discount banner to track selection 2019-06-03 14:18:17 -04:00
irfanuddinahmad
53265d506e user existence check updated to use email only 2019-05-30 12:30:14 +05:00
Zachary Hancock
1bb449a742 Merge pull request #20653 from edx/zhancock/complete-waiting-enrollments 
complete waiting enrollments. fixed
 2019-05-29 10:30:16 -04:00
Nimisha Asthagiri
01ccd877e6 Merge pull request #20702 from edx/bom/enrollment-readme 
Enrollments README and refactor
 2019-05-28 16:58:27 -04:00
Nimisha Asthagiri
6e214a85b0 Move common/djangoapps/enrollment to openedx/core/djangoapps/enrollments 2019-05-28 11:20:53 -04:00
Zach Hancock
a350d327de complete waiting enrollments. fixed 2019-05-24 13:47:49 -04:00
Matthew Piatetsky
936f94cfb4 fix issue for all dashboard redirect messages (#20689) 
fix issue for all dashboard redirect messages
 2019-05-24 12:32:06 -04:00
Matthew Piatetsky
42d551096a fix xss issue for all dashboard redirect messages 2019-05-24 11:34:39 -04:00
Jeremy Bowman
f9929f32b5 Update quality threshold counts (#20681) 2019-05-24 08:27:54 -04:00
noraiz-anwar
34cf433588 rate limit requests for password reset emails 2019-05-23 13:29:36 +05:00
Michael Roytman
b0f715d1c2 add a GET endpoint to get course run overviews for a user's program enrollment 2019-05-22 13:35:49 -04:00
Michael Roytman
5da94023e6 Merge pull request #20620 from edx/mroytman/bulk-email-python-api 
introduce Python API for BulkEmail Djangoapp
 2019-05-21 18:38:24 -04:00