Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
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
Brian Beggs
bd76eee0bf Merge pull request #19474 from edx/amannan/DE-1172 
Add email in course enrollment event
 2019-01-04 15:14:36 -05:00
Nimisha Asthagiri
92ae95a0b7 Merge pull request #19504 from edx/arch/fix-sso-redirect 
Fix Studio SSO with Third Pary Auth
 2019-01-02 12:14:33 -05:00
Dave St.Germain
a6ff120f8f Merge pull request #19366 from edx/dahlia/proctoring-master 
Upgrade edx-proctoring to version 1.5
 2019-01-02 11:37:55 -05:00
Asad Iqbal
987192332a Merge pull request #19475 from edx/asadiqbal08/ENT-1359 
asadiqbal08/ENT-1359 Verification by email of recovery address.
 2019-01-01 15:20:57 +05:00
Abdul Mannan
ecfb18bf08 Add email in course enrollment event 2018-12-31 16:49:54 +05:00
Saleem Latif
eaf93d5978 Update sign in email address for continued access 2018-12-31 11:34:05 +05:00
asadiqbal
e21477c224 Verification by email of recovery address. 2018-12-27 18:51:55 +05:00
Nimisha Asthagiri
f840774169 Fix Studio SSO 
ARCH-329
 2018-12-22 22:48:46 -05:00
Jansen Kantor
49a88db7aa Merge pull request #19502 from edx/jkantor/roles-filter 
add an optional parameter roles query to filter by course
 2018-12-21 15:07:49 -05:00
jansenk
547bd7c97a add an optional parameter roles query to filter by course 
EDUCATOR-3796
 2018-12-21 13:32:24 -05:00
Zia Fazal
ae34212528 Fixed bug which stopped new user link with All edX Users sailthru list 2018-12-21 12:11:20 -05:00
Michael Roytman
880a06b981 do not show Create Zendesk Tickets For Suspicious Proctored Exam Attempts Studio Advanced Setting field if user is not edX staff 2018-12-21 11:16:28 -05:00
Jansen Kantor
62e2ba4503 Merge pull request #19488 from edx/jkantor/list-roles-staff 
add is_staff to roles api response
 2018-12-21 11:14:17 -05:00
jansenk
eff58b289a add is_staff to roles api response 
EDUCATOR-3796
 2018-12-21 10:22:29 -05:00
Dave St.Germain
28e6565368 Quick fix for cohort problem in enrollment API 2018-12-20 15:47:58 -05:00
George Babey
9d02b29cd7 Merge pull request #17955 from eduNEXT/ednx/Support-Underscore-Templates-Theme 
OSPR-2352 | Support for theming .underscore files
 2018-12-20 10:44:55 -05:00
Nimisha Asthagiri
3a45bee3ea Merge pull request #19453 from edx/arch/cleanup-login 
Studio login/registration redirects to LMS
 2018-12-19 11:52:45 -05:00
Michael Terry
bd6743d96e Remove PasswordHistory model 
This completes the work to deprecate PasswordHistory.

DEPR-7
 2018-12-19 09:45:53 -05:00
Michael Terry
e8555de4b4 Merge pull request #19423 from edx/mikix/password-history-removal 
Remove PasswordHistory
 2018-12-19 09:22:39 -05:00
asadiqbal
24b58b5275 ENT-1115 2018-12-18 16:46:16 -05:00
Saleem Latif
38ac3d5032 Request password reset with recovery email address 2018-12-18 14:20:08 +05:00
Nimisha Asthagiri
886bc4b20b Studio login/registration redirects to LMS 2018-12-17 20:50:57 -05:00
Bill Filler
0858ae233a Merge pull request #19461 from edx/bfiller/REVE-190 
REVE:190 - check if user is in holdback before showing new track selection
 2018-12-17 16:45:31 -05:00
Bill Filler
684d6e3669 check if user is in holdback before showing new track selection 2018-12-17 16:05:13 -05:00
Nimisha Asthagiri
358ed851dc Merge pull request #19442 from edx/arch/infinite-login-loop-spike 
Check and update login status with all login-related cookies
 2018-12-17 14:31:48 -05:00
Nimisha Asthagiri
c7c8e856cd Check and update login status with all login-related cookies 2018-12-17 13:03:32 -05:00