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

4569 Commits

Author SHA1 Message Date
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
Michael Terry
01129787c0 Remove PasswordHistory 
This is a feature that has been deprecated and can be safely removed.

DEPR-7
 2018-12-13 13:18:56 -05:00
jansenk
0fb7c101c7 Add API call to list roles of the logged-on user 
EDUCATOR-3796
 2018-12-12 14:54:07 -05:00
Awais Jibran
fda85ddcf5 Merge pull request #19418 from edx/aj/fix-segmentio-event 
Handle string datetime with datetime parser.
 2018-12-12 12:08:08 +05:00
Awais Jibran
ddd69db7cf Handle string datetime with datetime parser. 2018-12-11 13:24:10 -05:00
Saleem Latif
bd411de12d Add recovery email to account settings page 2018-12-10 17:59:19 +05:00
Matthew Piatetsky
14a899a65d REVE-104 & REVE-108: Ensure Course Roles' Access 2018-12-07 16:39:09 -05:00
Felipe Montoya
1119e1e69a Making the include function used to support static .underscore templates support comprehensive_theming 2018-12-06 16:06:32 -05:00
Saleem Latif
a28eb818be Fixed quality and a typo 2018-12-06 21:51:04 +05:00
Saleem Latif
18b66819e2 Revert "ENT-1116: Add recovery email to account settings page" 2018-12-06 21:20:46 +05:00
Saleem Latif
2055f94253 Add recovery email to account settings page 2018-12-06 14:27:28 +05:00
Calen Pennington
31047260cc Switch ContentTypeGatingConfig.enabled_as_of and CourseDurationLimitConfig.enabled_as_of to datetimes 2018-11-30 10:02:53 -05:00
Zainab Amir
b62ab09d85 LEARNER-6643 
Added management command to update credit eligibility deadline
Added tests for command change_eligibility_deadline
 2018-11-27 14:12:16 +05:00
Bill Filler
af8f1029cd Merge pull request #19293 from edx/bfiller/REVE-96 
Don't allow audit-only courses to expire
 2018-11-26 15:49:02 -05:00
Bill Filler
7b684106ba Don't allow audit-only courses to expire 2018-11-26 14:28:50 -05:00
Brian Wilson
48a3db7ffa Fix synthesized URL emitted to Segment. 
Add schema to URL synthesized from host and path.
 2018-11-22 02:40:02 -05:00
Calen Pennington
0cb48dfe1c Add StackedConfigurationModels for managing content_type_gating and course_duration_limits 2018-11-21 12:18:10 -05:00
Matthew Piatetsky
2b2560f671 Merge pull request #19278 from edx/REV-620 
[REVE-620] handle case when list of programs for course is empty
 2018-11-20 17:57:24 -05:00
Matthew Piatetsky
6f8090eadb handle case when list of programs for course is empty 2018-11-20 13:11:33 -05:00
Brian Wilson
9e417fb5e4 Add creation of url from host and path. 2018-11-19 14:36:07 -05:00
Gabe Mulley
5311509b19 Provide more context to calls to Segment. 
Implementation for DE-1089.

Centralize the definition of context into a single method.  This is in
common/djangoapps/track because the context is originally set there by
middleware.
 2018-11-15 20:56:10 -05:00