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

47802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Filler
1b60dea806 modify completion percentage calculation to account for single component that is excluded/ignored 2018-11-15 16:21:52 -05:00
irfanuddinahmad
d45e00ba14 Merge pull request #19265 from edx/iahmad/ENT-1169-version-bump-for-edx-enterprise-to-1-0-5 
version bump for edx-enterprise to 1-0-5
 2018-11-14 16:06:01 +05:00
irfanuddinahmad
48360c6f5f version bump for edx-enterprise to 1-0-5 2018-11-14 05:03:50 -05:00
Alex Dusenbery
12c502b35f Change gradebook GET endpoint to allow filtering by multiple attributes. 2018-11-13 16:18:52 -05:00
Bill Filler
210549f314 Merge pull request #19146 from edx/bfiller/add-expired-mobile 
mobile api changes for course expiration
 2018-11-13 13:22:59 -05:00
Michael Youngstrom
86dd18e654 Merge pull request #19248 from edx/youngstrom/fixup-script 
Tweak script that gets test list in xdist builds
 2018-11-13 11:45:01 -05:00
Michael Youngstrom
c737cf939e Tweak script that gets test list in xdist builds 2018-11-13 10:34:33 -05:00
Qubad786
e6a1df4893 bump edxval 2018-11-13 18:53:49 +05:00
noraiz-anwar
ce41896deb add babel-polyfill in commons 2018-11-12 18:13:51 +05:00
AsadAzam
da60f9ec32 Merge pull request #19220 from edx/Educator-3660-add-waffle-disable-quality 
Add waffle flag to disable quality for course-v1:HarvardX+SW12.1x+2016
 2018-11-12 13:11:49 +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
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
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
asadazam93
75f0211b0d Add waffle flag to disable quality for course-v1:HarvardX+SW12.1x+2016 2018-11-09 18:35:11 +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