Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,873 Commits 1 Branch 0 Tags
27dfbd02408ffdbf002dadcab2e9939db9f2d42e
Commit Graph

4630 Commits

Author SHA1 Message Date
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
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
Saleem Latif
63f8074402 Update dashboard alert link and account settings page styling 2019-02-07 14:00:27 +05:00
Calen Pennington
829227ade3 Merge pull request #19663 from cpennington/fbe-improve-course-api-performance 
Fbe improve course api performance
 2019-02-06 11:01:25 -05:00
Calen Pennington
419657d7a5 Prefetch course modes used in has_access calls in course api 2019-02-06 10:11:15 -05:00
Matthew Piatetsky
9681ca36b8 fix unicode strings in common/ 2019-02-05 10:57:00 -05:00
Michael Youngstrom
e7898d153d Move to python3-saml 2019-01-30 16:35:16 -05:00
Brian Mesick
c948f335bd Merge pull request #19665 from edx/bmedx/PLAT-2411 
Use correct language code in retirement emails
 2019-01-28 16:45:31 -05:00
Audrey
0589037545 Merge pull request #19661 from edx/aekao/REVEM-136/tearDownBundlingTest 
Tearing down data from bundling test
 2019-01-28 16:04:55 -05:00
Audrey Kao
3b4c4c30cb Tearing down data from bundling test, see REVEM-136 2019-01-28 15:00:28 -05:00
bmedx
43e1bf8e3c Use correct language code in retirement emails 2019-01-28 13:33:39 -05:00
Julia Eskew
48073300e7 Merge pull request #19106 from open-craft/clemente/fix-courseenrollment-admin-querydict 
Fix error when saving CourseEnrollment in admin
 2019-01-28 11:14:04 -05:00
Daniel Clemente Laboreo
e0b0c375be Fix error when saving CourseEnrollment in admin 2019-01-28 14:42:41 +02:00
Calen Pennington
805f32a357 Revert "Allow courses api to return data incrementally" 2019-01-25 12:56:57 -05:00
Calen Pennington
c9ed838991 Merge pull request #19642 from cpennington/fbe-improve-course-api-performance 
Allow courses api to return data incrementally
 2019-01-25 11:31:24 -05:00
Calen Pennington
0d273e9506 Prefetch course modes used in has_access calls in course api 2019-01-25 10:30:09 -05:00
Zubir Afzal
c3aa5149f1 ENT-1438 Update wording in account recovery flow 2019-01-24 13:39:56 +05:00
Saleem Latif
46d97caa47 Consolidate recovery assistance forms 2019-01-22 15:09:11 +05:00
Ned Batchelder
48ac13e73e Merge pull request #19591 from cclauss/print_function 
Use print() function in both Python 2 and Python 3
 2019-01-16 17:59:11 -05:00
adeelehsan
2390966e9b Added logs 
added username log if unable to authenticate
newly created user for 1st time while its
account is still inactive.
Purpose of log is to find specific useranme
inorder to investigagte LERANER-6026
 2019-01-15 18:31:53 +05:00