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

5629 Commits

Author SHA1 Message Date
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
Cali Stenson
4dcda2858e Add group partitions information to user metadata in the dom. 
This information will inform our A/B testing and experiments.

REV-612
 2018-11-16 16:34:17 -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
Bill Filler
1b60dea806 modify completion percentage calculation to account for single component that is excluded/ignored 2018-11-15 16:21:52 -05:00
Gabe Mulley
009c1f7901 REVE-81: fix errors in drag and drop and ORA2 xblocks 
Also fixes REVE-82
 2018-11-15 14:29:51 -05:00
Matt Tuchfarber
cc58aaaf8a Merge pull request #19269 from edx/tuchfarber/add_usd_to_content_gating 
Add USD to content gating upsell
 2018-11-15 13:53:46 -05:00
Waheed Ahmed
930d442592 Merge pull request #19264 from edx/waheed/LEARNER-6219-update-session-cookie-expiry 
Update session cookie expiry.
 2018-11-15 14:09:53 +05:00
Matt Tuchfarber
53536f2c96 Add USD to content gating upsell 2018-11-14 15:59:11 -05:00
Cali
db88e457a3 Merge pull request #19263 from edx/cstenson/gating_xblock_handler_test 
Add Xblock Handler tests for content gating.
 2018-11-14 14:33:07 -05:00
Cali Stenson
c34cbba464 Add Xblock Handler tests for content gating. 
REVE-13
 2018-11-14 10:55:51 -05:00
Brian Mesick
2dfa24d43a Merge pull request #19259 from edx/bmedx/speed_up_lms_misc 
PLAT-2371 - speed up the LMS_MISC retirement step
 2018-11-14 10:54:31 -05:00
Waheed Ahmed
bf5ad9b871 Update session cookie expiry. 
Update session cookie expiry to 4 weeks regardless of remember me
checkbox is checked or not.

LEARNER-6219
 2018-11-14 17:36:51 +05:00
Awais Jibran
4b9a8547d4 Merge pull request #19258 from edx/revert/paulo/anonymous-views 
Revert "Merge pull request #18720 from open-craft/paulo/anonymous-views"
 2018-11-12 13:03:44 +05:00
Cali Stenson
adffc11856 REVE-18: Test Content Type Gating For All Modes 2018-11-09 16:57:12 -05:00
Bill Filler
8409515be5 Only display content upsell message for Audit track 
REVE-39
 2018-11-09 13:18:55 -05:00
bmedx
1716b97cfc PLAT-2371 - speed up the LMS_MISC retirement step 2018-11-09 13:00:36 -05:00
Awais Jibran
194c6bacb6 Revert "Merge pull request #18720 from open-craft/paulo/anonymous-views" 
This reverts commit f9ae594dfe, reversing
changes made to 7c08e50fde.
 2018-11-09 22:49:14 +05:00
Bill Filler
7a80e91af0 Merge pull request #19257 from edx/bfiller/fix-broken-imports 
Fix edx-drf-extension imports
 2018-11-09 10:31:07 -05:00
Cali
72bdb24cdd Merge pull request #19247 from edx/cstenson/lti_problem_content_gating_tests 
Add LTI problem type tests on content gating.
 2018-11-09 10:01:15 -05:00
Bill Filler
a1f2c2cdde Fix edx-drf-extension imports 2018-11-09 09:56:23 -05:00
Cali Stenson
1ec08701d2 Add LTI problem type tests on content gating. 
REV-492
 2018-11-09 09:23:44 -05:00
Dave St.Germain
efa583283d Merge pull request #18975 from open-craft/MCKIN-8395/cohorts-api 
Cohorting API
 2018-11-09 07:25:38 -05:00
Paulo Viadanna
17c0d6d59f Add an alternative cohort management API 
This is primarily intended to be used for server to server
communication. The endpoints support OAuth2 authentication.
 2018-11-09 15:13:55 +05:30
Matthew Piatetsky
98069ba2cb Merge pull request #19250 from edx/REV-503/add-banner-to-courseware 
add expiration banner
 2018-11-08 18:17:43 -05:00
Matthew Piatetsky
6cc4fb34be add expiration banner 2018-11-08 17:27:12 -05:00
Matt Tuchfarber
be472a8d52 Extract upsell into template, extract ecomm call, use mobile utils 2018-11-08 11:40:06 -05:00
Gabe Mulley
372d51fd46 Display an upsell message instead of gated content 
REV-504
 2018-11-08 11:40:02 -05:00
Matthew Piatetsky
bd6018a4be Merge pull request #19236 from edx/REVE-78 
change access_duration to be weeks_to_complete or default MIN_DURATION for all courses
 2018-11-07 15:23:36 -05:00
Diana Huang
7c0aa06d5d Force new page if not set in site configs. 2018-11-07 15:10:58 -05:00
Matthew Piatetsky
dfe189e9bb change access_duration to be weeks_to_complete or MIN_DURATION for both SP and IP courses 2018-11-07 13:18:25 -05:00
Matthew Piatetsky
b996fd1b6e do not gate zero weight problems 2018-11-07 12:18:53 -05:00