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

47821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
63a71523b8 Merge pull request #19270 from edx/tuchfarber/make_alert_banner_mobile_friendly 
Remove min-width requirement on alert banner so it's mobile friendly.
 2018-11-15 13:54:03 -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
Jeremy Bowman
6c134b3c24 Merge pull request #19249 from edx/jmbowman/TE-2804 
TE-2804 Optimize pipeline git usage
 2018-11-15 11:49:04 -05:00
Cali
af07971c89 Merge pull request #19268 from edx/cstenson/delete_flaky_videohandlertest 
Delete flaky bokchoy test.
 2018-11-15 09:19:06 -05:00
Ned Batchelder
10a0c5bd84 Merge pull request #18956 from eduNEXT/dqe/Improving-RTL-support 
Campus.IL - Improving RTL support
 2018-11-15 07:12:51 -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
Jeremy Bowman
84d780e681 TE-2804 Optimize pipeline git usage 2018-11-14 16:17:17 -05:00
Matt Tuchfarber
e6ee0436f1 Remove min-width requirement on alert banner so it's mobile friendly. 2018-11-14 16:15:08 -05:00
Cali Stenson
88dd02079d Delete flaky bokchoy test. 
See ticket: EDUCATOR-3716
 2018-11-14 16:02:55 -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
Rabia Iftikhar
260c7e32d8 Merge pull request #19267 from edx/ri/EDUCATOR-3615-split_test-module 
EDUCATOR-3615 make code defensive if self.child is None in log_child_render method
 2018-11-14 21:44:34 +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
rabiaiftikhar
633a3a5dfd EDUCATOR-3615 make code defensive if self.child is None in log_child_render method 2018-11-14 18:49:44 +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
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
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
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