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

3091 Commits

Author SHA1 Message Date
Michael Youngstrom
4feaee2bd8 Fix some eslint warnings 2018-12-18 12:52:45 -05:00
Saleem Latif
38ac3d5032 Request password reset with recovery email address 2018-12-18 14:20:08 +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
Matthew Piatetsky
e2490d8f8e localize datetime for banner 2018-12-17 08:41:14 -05:00
Matt Tuchfarber
b034f4e0d4 Merge pull request #19450 from edx/tuchfarber/fix_experiment_integrity_error 
Ignore integrity error in revenue holdback experiment
 2018-12-14 16:52:29 -05:00
Matt Tuchfarber
885850eadb Ignore integrity error in revenue holdback experiment 2018-12-14 14:53:51 -05:00
Bessie Steinberg
6f2a2785e8 REVE-154 FBE Global Kill Switch 
Create a global kill switch for feature based enrollment.  To turn on
the kill switch (and turn off both course duration gating and content
type gating) enable a waffle flag named:
'content_type_gating.global_kill_switch'
 2018-12-14 09:36:56 -05:00
Matthew Piatetsky
d7a6fb5c0c fix quality error 2018-12-13 16:17:37 -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
Matthew Piatetsky
dda5eded24 fix bug with banner deadline logic 2018-12-13 12:32:14 -05:00
Gabe Mulley
5831a1f73d Merge pull request #19439 from edx/update_messaging 
update banner messaging
 2018-12-13 09:50:01 -05:00
Matthew Piatetsky
eaa07082ed update messaging 2018-12-13 01:15:48 -05:00
Matthew Piatetsky
93f6dfa330 Remove username from holdback key 2018-12-12 20:46:45 -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
David Ormsbee
192ed213f6 Merge pull request #19284 from open-craft/symbolist/access-for-unenrolled-learners 
Access for unenrolled learners.
 2018-12-10 11:03:00 -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
Matthew Piatetsky
14a899a65d REVE-104 & REVE-108: Ensure Course Roles' Access 2018-12-07 16:39:09 -05:00
Paulo Viadanna
c4fc4b5df6 Adds CouseModule.course_visibility and XBlock.public_view() for unenrolled users access to courses. 
The course_visiblity field can have one of three values:
1. private (default): This keeps the standard access rules.
2. public_outline: Allows unenrolled and anonymous users access to the outline.
3. public: Allows unenrolled and anonymous users access to both outline and
   course content.

When an unenrolled user accesses course content, instead of student_view(),
public_view() is used. A default implementation is provided for XBlocks
which do not implement this view. The public_view() must not have any
functionality which assumes the presence of a valid User and should show
a readonly only interface for the XBlock content.
 2018-12-07 22:17:36 +05:00
Cali Stenson
241cff006a Add user_metadata to reflect if a user has purchased before. 
REVO-20
 2018-12-07 07:48: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
Alex Dusenbery
cb3b7e1822 Make gradebook GET API more performant. 2018-12-06 10:53:16 -05:00
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