Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,428 Commits 1 Branch 0 Tags
72ec00cbb71d0a1d7201dfdcd92462156dbd6152
Commit Graph

6209 Commits

Author SHA1 Message Date
Saleem Latif
2055f94253 Add recovery email to account settings page 2018-12-06 14:27:28 +05:00
Matt Tuchfarber
c263360eda Merge pull request #19355 from edx/tuchfarber/add_content_gating_deduplication_tests 
Add tests to verify access denied message deduplication works
 2018-12-05 14:14:15 -05:00
Matt Tuchfarber
5a60fc1db6 Add tests to verify access denied message deduplication works 2018-12-05 13:40:22 -05:00
Brian Wilson
76053f47ad Add hostname to GoogleAnalyticsTrackingPixel. 2018-12-04 17:26:52 -05:00
Gabe Mulley
5efccffe4a Merge pull request #19368 from edx/test-asset-fix 
Switch static assets to courseware friendly version
 2018-12-04 14:14:07 -05:00
Calen Pennington
54a2cae482 Switch static assets to courseware friendly version 2018-12-04 13:23:15 -05:00
brianhw
acc919ca46 Merge pull request #19353 from edx/brian/DE-1121-email-context 
Add page context to edx.bi.email.sent events
 2018-12-04 12:10:27 -05:00
Brian Wilson
f21bf05e37 Add page context to edx.bi.email.sent events. 2018-12-04 02:47:37 -05:00
Matthew Piatetsky
67e9ae5581 Fix content gating a11y issues 2018-12-03 23:26:47 -05:00
Gabe Mulley
3c5caaf762 REVE-103: Fix masquerade for feature based enrollments 2018-12-03 12:05:00 -05:00
Feanil Patel
eb8b5575ae Correct to use datetime instead of date. 2018-12-03 10:38:48 -05:00
Calen Pennington
bced52b728 Merge pull request #19334 from cpennington/enabled-as-of-datetime 
Enabled as of datetime
 2018-11-30 15:09:11 -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
Matthew Piatetsky
bbfbd43cb7 Merge pull request #19335 from edx/REVE-108 
Ensure staff users do not see expiration banner
 2018-11-29 12:42:25 -05:00
Calen Pennington
af86f7856c Merge pull request #19333 from cpennington/enable-content-gate-partition-when-override-enabled 
Enable content gate partition when override enabled
 2018-11-29 10:59:47 -05:00
Calen Pennington
f8833e1ffc Enable the ContentTypeGatePartition when the ContentTypeGatingConfig.studio_override_enabled is True 2018-11-29 10:24:41 -05:00
Matthew Piatetsky
08301a484e Ensure staff users do not see expiration banner 2018-11-29 09:45:49 -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
Matthew Piatetsky
815acda002 Populate experiment data with holdback key post enrollment and check holdback key when setting user group 2018-11-28 13:40:57 -05:00
Braden MacDonald
1e4dc51ac7 Allow calling xblock_view API with OAuth creds 2018-11-28 09:25:30 -08:00
Calen Pennington
2a42628e19 Put actual data in ContentTypeGatingConfig and CourseDurationLimitConfig __str__ methods 2018-11-28 12:19:33 -05: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
Calen Pennington
a7ab4be972 Merge pull request #19314 from cpennington/test-super-user-access 
Add GlobalStaff to role tests for course duration limits and content …
 2018-11-28 10:08:07 -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
Calen Pennington
f17f88741a Add GlobalStaff to role tests for course duration limits and content gating 2018-11-27 15:26:00 -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
emma-green
5167cf6cb4 Merge pull request #19288 from edx/emma-green/reve-74/make-sure-content-experiments-work-b 
add content experiments test to content gating
 2018-11-26 17:12:29 -05:00
Emma Green
2d5044512f add content experiments test to content gating 2018-11-26 16:29:11 -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
Matt Tuchfarber
d34c65a559 Merge pull request #19311 from edx/tuchfarber/content_gating_i18n 
Add translation for content gating access denied message
 2018-11-26 14:46:50 -05:00
Bill Filler
7b684106ba Don't allow audit-only courses to expire 2018-11-26 14:28:50 -05:00
Matt Tuchfarber
8b5b92b01a Add translation for content gating access denied message 2018-11-26 13:27:12 -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
Bessie Steinberg
1bbd9dd131 Merge pull request #19301 from edx/bessiesteinberg/REVE-23-beta-testers 
REVE-101: Fix Beta Tester Experience and Test
 2018-11-26 10:01:22 -05:00
Gabe Mulley
1441cba962 Merge pull request #19272 from edx/reve-37/prevent-studio-edits 
REVE-37: prevent studio edits to feature based enrollments
 2018-11-26 09:57:23 -05:00
Gabe Mulley
f42094aefe fix a python unit test that fails at night 2018-11-25 21:42:02 -05:00
Gabe Mulley
5177e994c8 REVE-37: Prevent modifications to feature based enrollment user partitions 2018-11-25 21:42:02 -05:00
Bessie Steinberg
4baedd37eb REVE-101: Fix Beta Tester Experience and Test 
Fix content type gating and duration gating expierence for Beta Testers

- Beta Testers are users who are granted early access to the course to
  test it out, they should not be gated on type or duration
- This change makes sure beta testers will have access to graded content
  and their access will not expire
- Added unit tests for the above change
 2018-11-21 16:22:36 -05:00
Calen Pennington
f84c121f43 Clean up several xss linter issues 2018-11-21 12:18:10 -05:00
Calen Pennington
b295472363 Use generator expressions to make Mobile API constraints clearer 2018-11-21 12:18:10 -05:00
Calen Pennington
0cb48dfe1c Add StackedConfigurationModels for managing content_type_gating and course_duration_limits 2018-11-21 12:18:10 -05:00
Bessie Steinberg
1de077725a REVE-23: Test Course Team Roles 
- Create tests for the two types of course team roles (i.e. ensure that both instructor and staff course roles have access to graded content and their access won't expire)

Remaining work:
- This change does not include all types of course staff users (ex. discussion moderators, beta testers, TAs)
 2018-11-20 16:39:20 -05:00
Matt Tuchfarber
be2d55a54e Remove root path of static image 2018-11-20 15:31:55 -05:00
brianhw
22b12b037a Merge pull request #19206 from edx/brian/segment-addpage 
Provide more context to calls to Segment.
 2018-11-19 15:29:52 -05:00
Bill Filler
cc8dd817a3 Merge pull request #19273 from edx/bfiller/REVE-71 
modify completion percentage calculation
 2018-11-19 08:49:41 -05:00