Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,788 Commits 1 Branch 0 Tags
9175139f94f3dce2cf6e35d79ea227d51dda89db
Commit Graph

47788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rabia Iftikhar
9175139f94 Merge pull request #19238 from edx/ri/EDUCATOR-3668-add-logs 
EDUCATOR-3668 add temporary logs to track to track the invocation of compute_all_grades_for_course task
 2018-11-12 12:23:40 +05:00
Bessie Steinberg
2673571a9f Merge pull request #19245 from edx/bessiesteinberg/REVE-18-test-course-mode 
REVE-18: Test Content Type Gating For All Modes
 2018-11-09 18:59:05 -05:00
Bill Filler
26c106b244 Merge pull request #19255 from edx/bfiller/REVE-6 
REVE-6: Show expiration banner on Progress page
 2018-11-09 17:23:59 -05:00
Cali Stenson
adffc11856 REVE-18: Test Content Type Gating For All Modes 2018-11-09 16:57:12 -05:00
Bill Filler
cebd85e681 Add expiration banner to progress page 
In audit mode, add expiration banner to course progress page

REVE-6
 2018-11-09 16:13:35 -05:00
Bill Filler
4d05cf2872 Merge pull request #19256 from edx/bfiller/REVE-39-rebase 
Only display content upsell message for Audit track
 2018-11-09 14:21:31 -05:00
Bill Filler
8409515be5 Only display content upsell message for Audit track 
REVE-39
 2018-11-09 13:18:55 -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
e165b8faf8 Merge pull request #19188 from edx/rev/content-gating-upsell 
Display access denied message
 2018-11-08 16:27:21 -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
Dave St.Germain
6e7d19024f Merge pull request #19032 from open-craft/jill/add_cohorts_to_bulk_enroll 
Add cohorts to BulkEnroll endpoint.
 2018-11-08 11:36:19 -05:00
Ned Batchelder
644cf1e60a Merge pull request #19237 from edx/nedbat/remove-unused-imports 
Remove unused imports
 2018-11-08 09:56:57 -05:00
Muhammad Ammar
860bfcd84d Merge pull request #19251 from edx/ammar/ENT-1200 
update edx-enterprise version to 1.0.4
 2018-11-08 15:44:12 +05:00
muhammad-ammar
07955f2382 update edx-enterprise version to 1.0.4 
ENT-1200
 2018-11-08 10:50:45 +05:00
afzaledx
2238843286 Add cohorts to BulkEnroll endpoint. 2018-11-08 09:23:07 +10:30
rabiaiftikhar
14ed80a488 EDUCATOR-3668 add temperory logs 2018-11-08 02:46:39 +05:00
Douglas Hall
42d445c901 Merge pull request #19246 from edx/douglashall/set_devstack_jwt_algorithm 
Set the JWT_SIGNING_ALGORITHM setting for devstack.
 2018-11-07 15:52:33 -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
Douglas Hall
1c17d3f855 Set the JWT_SIGNING_ALGORITHM setting for devstack. 2018-11-07 15:23:12 -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
52908d89e0 Merge pull request #19170 from edx/do_not_gate_zero_weight_problems 
Do not gate zero weight problems
 2018-11-07 12:52:42 -05:00
Matthew Piatetsky
b996fd1b6e do not gate zero weight problems 2018-11-07 12:18:53 -05:00
Ned Batchelder
046fe60913 Remove unused imports 2018-11-07 10:31:51 -05:00
Cali
eafbc0c8d2 Merge pull request #19195 from edx/cstenson/has_access_tests 
Add has access tests to content gating graded problem types.
 2018-11-07 10:05:01 -05:00
Cali Stenson
549941e608 Add has access tests to content gating graded problem types. 
REV-492
 2018-11-07 09:08:46 -05:00
Albert (AJ) St. Aubin
f5ef546652 Merge pull request #19240 from edx/aj/program_cache_logging 
Updated logging to include stack trace
 2018-11-07 09:07:26 -05:00
Farhanah Sheets
95aa21870d Merge pull request #18431 from jerrybox/master 
fix: closed caption can't move when mutiple videos in one page.
 2018-11-07 08:46:30 -05:00
David Ormsbee
f9ae594dfe Merge pull request #18720 from open-craft/paulo/anonymous-views 
Support for anonymous_view
 2018-11-07 08:45:15 -05:00
Albert St. Aubin
caf89550f2 Updated logging to include stack trace 2018-11-07 08:19:53 -05:00
Usman Khalid
d65c9a331a Disable xss-lint false positives in x_module.py. 2018-11-07 16:19:46 +05:00
Paulo Viadanna
e6e0a02e0a 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-11-07 16:18:39 +05:00
Nimisha Asthagiri
7c08e50fde Merge pull request #19229 from edx/arch/fix-studio-login 
Add JWT Signing Keys for Studio Login on Devstack
 2018-11-06 22:03:25 -05:00
Michael Youngstrom
6e2e5d0e03 Merge pull request #19233 from edx/youngstrom/fix-flaky-test 
Add waffle to installed_apps in openedx test settings file
 2018-11-06 15:50:38 -05:00
Douglas Hall
f0b63133d7 Merge pull request #19234 from edx/douglashall/devstack_cors_headers 
Set CORS_ALLOW_HEADERS in devstack settings.
 2018-11-06 15:32:27 -05:00
Douglas Hall
b0eb347c32 Set CORS_ALLOW_HEADERS in devstack settings. 2018-11-06 14:56:31 -05:00
Michael Youngstrom
5880fd36bc Add waffle to installed_apps for commonlib 2018-11-06 14:53:33 -05:00
Nimisha Asthagiri
116d3760b3 Add JWT Signing Keys for Studio Login on Devstack 2018-11-06 14:20:34 -05:00
Ned Batchelder
63d84d65e5 Merge pull request #19215 from edx/nedbat/remove-unused-imports 
Remove unused imports
 2018-11-06 13:57:46 -05:00
edx-pipeline-bot
112a3d1bba Merge pull request #19228 from edx/release-mergeback-to-master 
Merge release back to master
 2018-11-06 09:40:47 -05:00
Douglas Hall
f4df64ef26 Merge pull request #19224 from edx/douglashall/fix_login_redirect_whitelist 
Add LOGIN_REDIRECT_WHITELIST setting to production settings.
 2018-11-05 15:18:16 -05:00
Douglas Hall
726b28d4fa Add LOGIN_REDIRECT_WHITELIST setting to production settings. 2018-11-05 14:31:56 -05:00
Farhanah Sheets
44f10be03c Unicode developer_message to handle Spanish failures 2018-11-05 14:00:07 -05:00