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

2587 Commits

Author SHA1 Message Date
Calen Pennington
454acb492b Merge pull request #19578 from cpennington/fbe-group-configurations 
Fix Studio Group Configurations for courses with FBE Enabled
 2019-01-14 14:20:25 -05:00
Brian Mesick
72fa00050a Merge pull request #19571 from open-craft/jill/dot-app-cmd 
SE-614 Adds optional args to create_dot_application command
 2019-01-14 14:12:39 -05:00
Calen Pennington
bc32819ce0 Fix Studio Group Configurations for courses with FBE Enabled 
This prevents the Feature-Based Enrollments groups from showing
in Group Configurations unless the studio_override_enabled flag
is enabled. It also fixes a bug where FBE group configurations were
displaying usage as though they were Track-based group configurations.

REVMI-78
 2019-01-14 13:16:57 -05: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
Jillian Vogel
f1a65c588a Adds optional args to create_dot_application command 
Allows for the creation of public applications, and the passing of the
client_id or client_secret to the command, e.g. from a configuration playbook
 2019-01-10 20:18:18 +10:30
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
Jeremy Bowman
d0d6d57343 TE-2731 Upgrade to pytest-cov 2.6.1 2019-01-08 11:05:45 -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
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
AsadAzam
a340fc96d5 Merge pull request #19518 from edx/asad/lms-template-reflected-xss 
Clean XSS in lms template
 2018-12-31 13:07:39 +05:00
Saleem Latif
eaf93d5978 Update sign in email address for continued access 2018-12-31 11:34:05 +05:00
asadazam93
25cf39daa4 Clean XSS in lms template 2018-12-29 01:48:25 +05:00
asadiqbal
e21477c224 Verification by email of recovery address. 2018-12-27 18:51:55 +05:00
DawoudSheraz
ddf00790b6 EDUCATOR-3786 Anonymous user is not associated to any cohort 2018-12-21 12:47:41 +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
e8555de4b4 Merge pull request #19423 from edx/mikix/password-history-removal 
Remove PasswordHistory
 2018-12-19 09:22:39 -05:00
Michael Terry
95a6f1fa9e Allow searching restricted courses by key 2018-12-19 09:09:02 -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
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
Gabe Mulley
181a531aca remove translations from support form values 2018-12-13 16:13:10 -05:00
Bill Filler
92551e7b7a Merge pull request #19369 from edx/bfiller/REVE-88 
Add feature-based enrollments search to support form
 2018-12-13 14:01:45 -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
Calen Pennington
bbc1326685 Merge pull request #19089 from mitodl/xblock_aq_changes 
Refactored XBlockAside rendering and added support for student view
 2018-12-11 12:13:37 -05:00
Bill Filler
6606ddefff Add feature-based enrollment search to support form 2018-12-11 09:53:19 -05:00
DawoudSheraz
7b75e18f04 Static storage fix test 2018-12-11 13:58:28 +05:00
Gavin Sidebottom
3dad2be55d Refactored XBlockAside rendering and added support for student view 2018-12-11 12:27:03 +05:00
Alex Dusenbery
59915d24d3 Swagger API Docs fix: Add the base DRF Serializer as the serializer class for course_groups views that don't specify one. 2018-12-10 10:25:33 -05:00
Simon Chen
9866b045c0 Merge pull request #19401 from edx/schen/cohort_access 
Update cohort access to allow course staff to get cohorts as well as global staff
 2018-12-10 10:02:29 -05:00
Simon Chen
9a5b26ff33 Update cohort access to allow course staff to get cohorts as well as global staff 2018-12-10 08:35:55 -05:00
Saleem Latif
bd411de12d Add recovery email to account settings page 2018-12-10 17:59:19 +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
Brian Wilson
76053f47ad Add hostname to GoogleAnalyticsTrackingPixel. 2018-12-04 17:26:52 -05:00
Brian Wilson
f21bf05e37 Add page context to edx.bi.email.sent events. 2018-12-04 02:47:37 -05:00
Brian Mesick
4278fc7de2 Merge pull request #19320 from edx/bmedx/remove_3rd_part_mailings_retirement 
DEPR-8 - Remove retire_mailings endpoint and supporting code
 2018-11-28 14:16:54 -05:00
Braden MacDonald
1e4dc51ac7 Allow calling xblock_view API with OAuth creds 2018-11-28 09:25:30 -08:00
Nimisha Asthagiri
b4f0796ce6 Merge pull request #19327 from edx/arch/adr-jwt-cookie-opt-in 
Update jwt-in-session-cookie decision with HTTP_USE_JWT_COOKIE header
 2018-11-28 11:56:40 -05:00
Nimisha Asthagiri
bcbcbc4f80 Merge pull request #19325 from edx/arch/email-verified-field 
Add email_verified field in JWT token
 2018-11-28 07:35:33 -05:00
noraiz-anwar
e0d19d6871 escape json for use in js 2018-11-28 17:31:27 +05:00
Nimisha Asthagiri
9a0812fcde Add email_verified field in JWT token 2018-11-28 06:36:48 -05:00
nadeemshahzad
9d95c2e632 upgrade gunicorn 19.0 2018-11-28 08:08:21 +00:00
Nimisha Asthagiri
f19809c526 Update jwt-in-session-cookie decision to include HTTP_USE_JWT_COOKIE header 2018-11-27 23:59:34 -05:00
Alex Dusenbery
44101d656d Pick a better ordering field for CourseEnrollmentPagination in grades API. 2018-11-27 12:39:12 -05:00
bmedx
9b3abd5598 DEPR-8 - Remove retire_mailings endpoint and supporting code 2018-11-27 11:51:03 -05:00
Diana Huang
30eb003b2e Merge pull request #19243 from edx/diana/default-login-registration 
Force new page if not set in site configs.
 2018-11-26 10:06:19 -05:00