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

4669 Commits

Author SHA1 Message Date
Thomas Tracy
29fb1588a9 Another pip issue. 2019-04-10 09:02:50 -04:00
Thomas Tracy
f59dc6c820 Fix's bug that does not allow an Oauth2 provider to have different slug and backend_names 
Added comment to explain model change.

Removed accidental whitespace.

Another pip issue.
 2019-04-09 19:59:55 -04:00
Alex Dusenbery
d134a435d5 Add get_queryset method to CourseModesView; cleanup tests again 2019-04-05 16:12:35 -04:00
Michael Youngstrom
68ab69a46b Merge pull request #20162 from jolyonb/incr-200 
INCR-200 Migrate common/djangoapps/util/tests and migrations
 2019-04-05 14:04:08 -04:00
Hasnain Naveed
6acf53173f Merge pull request #20048 from edx/hasnain-naveed/WL-1903 
WL-1903 | Error handling for incorrect configuration of SAML Auth.
 2019-04-05 15:55:03 +05:00
Jolyon Bloomfield
8adaca66d1 INCR-200 Migrate common/djangoapps/util/tests and migrations 2019-04-05 00:57:46 -04:00
Alex Dusenbery
cddf32560d Cleanup after tests. 2019-04-04 20:27:27 -04:00
Jolyon Bloomfield
b8e1478ff0 INCR-126 Modernize common/djangoapps/student/management/tests (#20151) 2019-04-04 10:08:02 -04:00
Jolyon Bloomfield
26351509ee INCR-196 Migrating common/djanjoapps/student/signals and views (#20138) 2019-04-03 15:16:55 -04:00
Alex Dusenbery
eff3a07005 Add a course_modes REST API. 2019-04-03 14:44:00 -04:00
Bessie Steinberg
243738f828 ENT-1334: Fix: SSO users last_login set to NULL 
- The very first time a user signed in through SSO their ```last_login```
  field on the ```auth_user``` table was set to NULL instead of the
  appropriate time stamp.  This fixes that issue.
 2019-04-02 14:40:55 -04:00
Michael Youngstrom
d62b393c58 Merge pull request #20125 from edx/youngstrom/INCR-128 
INCR-128
 2019-04-02 14:18:24 -04:00
Douglas Hall
c8c365041b Merge pull request #20111 from edx/douglashall/ARCH-607 
ARCH-607 Add API view for retrieving third party auth user status.
 2019-04-02 13:40:13 -04:00
Douglas Hall
7128059921 Add API view for retrieving third party auth user status. 2019-04-02 12:58:13 -04:00
Michael Youngstrom
9d589f997d INCR-128 2019-04-02 12:40:26 -04:00
David Ormsbee
810b8b60f8 Merge pull request #19618 from open-craft/josuebc/upstream/BB-755 
BB-755 Add feature to manually unlock a student account after too many login attempts.
 2019-04-01 17:42:19 -04:00
Christie Rice
5462474aa6 Merge pull request #20072 from edx/crice/REVEM-203_dashboard 
REVEM-203 Add course and program info to dashboard metadata
 2019-04-01 09:16:53 -04:00
Christie Rice
052683f926 REVEM-203 Add course and program info to dashboard metadata 2019-03-30 08:30:07 -04:00
Jolyon Bloomfield
f7cb9641dd Migrating common/djangoapps/course_action_state 2019-03-29 12:42:28 -07:00
Cory Lee
ac4845d052 DEPR-14 Remove AWS.py 2019-03-28 10:48:34 -04:00
Thomas Tracy
d71d1dd454 Merge pull request #20011 from edx/ttracy/ENT-1584-tracking-for-email-change 
Ttracy/ent 1584 tracking for email change
 2019-03-27 09:26:45 -04:00
Thomas Tracy
1f8a9f5dc7 Added a tracking event for when the user switches their secondary email to their primary. 2019-03-26 13:41:34 -04:00
hasnain-naveed
c554ef6dd9 WL-1903 | Error handling for incorrect configuration of saml Auth. 2019-03-26 15:40:58 +05:00
Albert (AJ) St. Aubin
d47d22a9bb updating the import for entitlement tasks 2019-03-25 10:28:30 -04:00
Josue Balandrano Coronel
78f4ccb50a Expose LoginFailure model to Django's Admin UI to allow admin users 
unlock student accounts that have been locked out for excessive login
failures. This change will allow to quickly unlock student accounts when
time is of the essence (e.g. Timed exams).
 2019-03-22 10:22:01 -05:00
Calen Pennington
7d9ef1f65a Merge pull request #20040 from cpennington/revert-course-list 
Revert course list
 2019-03-22 10:05:31 -04:00
Calen Pennington
d23e888316 Revert "Reapply "Improve the performance of access checking for a specific user in CourseViewList by prefetching data"" 
This reverts commit 6059e21bff.
 2019-03-21 14:26:00 -04:00
Brittney Exline
34fa06aeda Merge pull request #20026 from edx/bexline/ent-1500 
ENT-1500 Update third_party_auth pipeline to override get_username
 2019-03-21 10:29:47 -04:00
Hammad Ahmad Waqas
2f931338db Merge pull request #20005 from edx/hammad/WL-1899 
WL-1899 | 500 error when SAML attribute is mapped + present, but has no value
 2019-03-21 15:09:23 +05:00
Hammad Ahmad Waqas
a48b59c24c fixed : when SAML attribute is mapped + present, but has no value 2019-03-21 12:08:50 +05:00
Brittney Exline
550d2616b5 ENT-1500 Update third_party_auth pipeline to override get_username 
We are doing this for two reasons:
1. We suspect that the get_username function in social_core is performing a case-sensitive
username check which is breaking when we try to create the user with a duplicate username.
This version ensures we perform a case insensitive check.

2. If it's not that, we want more logging information in order to debug the issue.
 2019-03-19 17:01:29 -04:00
cclauss
bb31716c97 Use ==/!= to compare str, bytes, and int literals 2019-03-19 21:40:06 +01:00
Jeremy Bowman
5e37a0c0bb Merge pull request #19621 from cclauss/Fix-ur-strings-for-Python3 
ur'strings' are syntax errors in Python 3
 2019-03-19 15:34:55 -04:00
Calen Pennington
6059e21bff Reapply "Improve the performance of access checking for a specific user in CourseViewList by prefetching data" 
This reverts commit d8cd6135a6.
 2019-03-18 15:24:40 -04:00
cclauss
9a0c995885 ur'strings' are syntax errors in Python 3 2019-03-17 13:56:02 +01:00
Calen Pennington
d8cd6135a6 Revert "Improve the performance of access checking for a specific user in CourseViewList by prefetching data" 
This reverts commit a2a340bcd0.
 2019-03-14 10:31:24 -04:00
Cali Stenson
01828034c4 Update enrollment course_price to verified price. 2019-03-13 14:52:33 -04:00
Matthew Piatetsky
d5c50533e1 Merge pull request #19968 from edx/PROD-58 
handle incorrectly set schedules
 2019-03-12 12:16:03 -04:00
Waheed Ahmed
458e8482ea Fix change enrollment command for credit. 
Get provider id from ecommerce upon changing enrollment to credit
instead of setting course_key org.

LEARNER-6643
 2019-03-12 15:30:48 +05:00
Matthew Piatetsky
dac0eec385 handle incorrectly set schedules 2019-03-11 16:46:29 -04:00
Calen Pennington
a2a340bcd0 Improve the performance of access checking for a specific user in CourseViewList by prefetching data 2019-03-11 10:37:53 -04:00
Robert Raposa
c0ae3a54fd Merge pull request #19949 from edx/ARCH-472-event-username-to-userid 
ARCH-472: Add user_id for username in event data.
 2019-03-06 18:14:28 -05:00
Robert Raposa
e8d60611de Add user_id for username in event data. 
In certain use cases, a caller may have the username and not the
user_id. In these cases, we add the user_id since events have
standardized on using the user_id as the unique id of a user.

ARCH-472
 2019-03-06 17:06:53 -05:00
Michael Roytman
5c4c3d0753 Merge pull request #19948 from edx/mroytman/EDUCATOR-4083-min-price-masters-course-mode 
allow configurability of the minimum price for a course mode
 2019-03-06 16:03:35 -05:00
Michael Roytman
c8b4f7e779 allow configurability of the minimum price for a course mode 2019-03-06 14:26:00 -05:00
Cali Stenson
7e6147f714 Add price information to enrollments and create dashboard_metadata 
for experiments.

REVEM-174
 2019-03-05 16:55:04 -05:00
Mike Dikan
2fc27a9caa Merge pull request #19693 from edx/mdikan/hackathon-21 
Removal of deprecated external auth.
 2019-03-04 13:48:57 -05:00
Waheed Ahmed
dbad75467e Return credit status error if no provider info found. 
Return credit status error if no provider info found in provider info by
id dict. Also add logs to get an idea what is in this dict.

LEARNER-6643
 2019-03-04 15:59:55 +05:00
Mike Dikan
2c149ca6be Removing the Deprecated the 'external_auth' package in favor of 'third_party_auth' which is the current recommendation. 2019-03-02 16:06:46 -05:00
Shadi Naif
1b83f24d3c Convert the (Email Change Confirmation) message to use edx-ACE 
Basically, this was done by:
1. Adding new class type in [common/djangoapps/student/message_types.py]
2. Adding new files for the ace template in a new directory named
    [common/templates/student/edx_ace/emailchangeconfirmation]
3. Removing old template files
    [confirm_email_change.txt] and [email_change_subject.txt]
    from the directories:
    [lms/templates/emails] and
    [common/test/test_sites/test_site/templates/emails]
4. Converting the [confirm_email_change] code to use [ace.send()]
 2019-02-27 16:22:16 +02:00