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

4648 Commits

Author SHA1 Message Date
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
Albert (AJ) St. Aubin
d47d22a9bb updating the import for entitlement tasks 2019-03-25 10:28:30 -04: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
Matt Tuchfarber
89c36ad65a Merge pull request #19858 from edx/bessiesteinberg/ent-1591 
ENT-1591: Validate Recovery Email a Primary Email
 2019-02-26 12:37:51 -05:00
emma-green
507cfb8942 Merge pull request #19849 from edx/emma-green/REVEM-176/C/Hacky-cache-course_runs-to-programs 
add course to program caching
 2019-02-25 10:41:51 -05:00
Dave St.Germain
954c8e1a67 Merge pull request #19771 from edx/dahlia/masters-track 
Added master's track
 2019-02-25 10:11:24 -05:00
Bessie Steinberg
16ceb8103c ENT-1591: Validate Recovery Email a Primary Email 
- On the accounts page validate that a recovery email is not any of the
  existing primary emails or one that has been retired.
 2019-02-22 13:27:10 -05:00
Emma Green
57b7150b09 add course to program caching 2019-02-22 13:18:23 -05:00
Jeremy Bowman
5c7a8e3ac1 Merge pull request #19622 from cclauss/Fix-parens-for-Python3 
Fix explicit tuple parameters for Python 3
 2019-02-21 15:45:09 -05:00
zrana
243145c706 Convereted lettuce tests into bokchoy for LTI Xblock 2019-02-21 13:31:27 +05:00
Matt Hughes
17f0a4fb52 Allow educators to partition masters students as content groups 
JIRA:EDUCATOR-4022
 2019-02-20 12:40:53 -05:00
Jeremy Bowman
974ae50bf4 Merge pull request #19620 from cclauss/new-style-exceptions 
Old style exceptions --> new style for Python 3
 2019-02-19 16:31:35 -05:00
bmedx
7df1e05f49 Fix xxslint errors in touched files 2019-02-19 11:24:24 -05:00
Julia Eskew
368f221f0a Initial start on annotations. 2019-02-19 11:24:21 -05:00
cclauss
c0c935b685 Old style exceptions --> new style for Python 3 2019-02-19 13:09:23 +01:00
cclauss
44d62fac75 Fix explicit tuple parameters for Python 3 2019-02-19 12:37:34 +01:00
adeelehsan
a05b3a3305 Merge pull request #19807 from edx/aehsan/LEARNER-6183/disable_third_party_if_account_password_is_unusable 
Disbale third party login
 2019-02-18 12:38:11 +05:00
Bessie Steinberg
1a94a69560 ENT-1512: Make Recovery Email Retireable 2019-02-15 14:21:32 -05:00
adeelehsan
73f57457c0 Disbale third party login 
if user password is unusable
then disable third party login

LEARNER-6183
 2019-02-15 16:03:11 +05:00
Saleem Latif
00b0baabbb Updating recovery email address from an already verified email address auto verifies the new address 2019-02-15 11:48:11 +05:00
Dave St.Germain
436416d86d Added modes to coursemode model 2019-02-13 10:21:04 -05:00
Dave St.Germain
6802a38a9d Added master's track 
Added mode option to course enrollment management command
 2019-02-13 10:21:04 -05:00
Michael Youngstrom
4bbd1dee0b Remove shards from commonlib-unit tests 2019-02-12 14:28:35 -05:00
Saleem Latif
ecc86f9827 Update final copy recovery feature copy 2019-02-07 15:55:42 +05:00