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

4615 Commits

Author SHA1 Message Date
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
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
cclauss
8fca11b85c Use print() function in both Python 2 and Python 3 2019-01-13 17:16:37 +01:00
Matthew Piatetsky
e1fd793e86 Merge pull request #19560 from edx/REVMI-2 
add informational banners when masquerading as user who would not have access due to start date
 2019-01-10 13:48:29 -05:00
Matthew Piatetsky
5bb56fe45f add informational banners when masquerading as user who would not have access due to start date 2019-01-10 11:06:30 -05:00
asadiqbal
4823981599 ENT-1419 changes 2019-01-10 15:57:01 +05:00
David Ormsbee
0ff988488f Merge pull request #18838 from open-craft/guruprasad/api-list-course-enrollments 
OC-5087 Create a staff-only API to list all course enrollments
 2019-01-09 10:52:36 -05:00
Diana Huang
15759c2b2f Merge pull request #19420 from edx/diana/remove-datadog 
Remove all references to datadog from our code.
 2019-01-09 09:07:22 -05:00
Saleem Latif
2c9021e480 Make sure only active AccountRecovery records are used 2019-01-09 16:33:12 +05:00
Diana Huang
6572d99e76 Remove all references to datadog from our code. 2019-01-08 15:41:24 -05:00
Julia Eskew
39accc0ae9 Make hash generation method private. 2019-01-08 15:08:59 -05:00
Julia Eskew
ad2cdb8c90 Fix the special case of same username/diff case and add test. 2019-01-08 15:08:59 -05:00
Guruprasad Lakshmi Narayanan
df45fe8317 Create a staff-only API to list all course enrollments 
This data can be used by external frontends or other apps. The list
of course enrollments can optionally be filtered by course id or
usernames.
 2019-01-08 17:27:46 +05:30
Gabe Mulley
a86d499592 Merge pull request #19470 from edx/bfiller/REVE-189 
Conditionalize track selection based on all FBE settings
 2019-01-07 15:42:28 -05:00
Calen Pennington
dc8aa9dae4 Merge pull request #19547 from cpennington/add-test-for-fbe-banner 
Add a test of the FBE Upgrade banner
 2019-01-07 14:26:20 -05:00
Calen Pennington
8b014e1fef Add a test of the FBE Upgrade banner 
REV-656
 2019-01-07 13:11:35 -05:00
Bill Filler
c253374372 Conditionalize track selection based on settings of course duration and content gating 2019-01-07 09:47:37 -05:00