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

47847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DawoudSheraz
cf2f91de1a Merge pull request #19290 from edx/dsheraz/educator_2234 
Educator 2234 - Avoid multiple mathjax loading on the discussion user profile page
 2018-11-22 11:37:59 +05:00
DawoudSheraz
e09fbab133 Avoid multiple mathjax loading on the discussion user profile page 2018-11-22 10:18:43 +05:00
Calen Pennington
b05eac0b67 Merge pull request #19235 from edx/content-gating-config-flag 
Content gating config flag
 2018-11-21 12:52:17 -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
Michael Youngstrom
40a5e4a441 Merge pull request #19296 from edx/youngstrom/update-python-jenkinsfile 
Adjust unittest container counts and delete old Jenkinsfile
 2018-11-21 11:38:51 -05:00
Matthew Piatetsky
2b2560f671 Merge pull request #19278 from edx/REV-620 
[REVE-620] handle case when list of programs for course is empty
 2018-11-20 17:57:24 -05:00
Bessie Steinberg
fb5ad203d3 Merge pull request #19277 from edx/bessiesteinberg/REVE-23-test-staff-types 
Bessiesteinberg/reve 23 test staff types
 2018-11-20 17:25:25 -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
d8184dc1bb Merge pull request #19295 from edx/tuchfarber/fix_static_image_path 
Remove root path of static image
 2018-11-20 16:24:09 -05:00
Michael Youngstrom
7622c6850e Adjust unittest containers and delete old Jenkinsfile 2018-11-20 16:21:31 -05:00
Matt Tuchfarber
be2d55a54e Remove root path of static image 2018-11-20 15:31:55 -05:00
Alex Dusenbery
174d80ed25 Revert "Add extesion engine gradebook ui in under the mastersGradebook route" 
This reverts commit 0c8d66bb2a.
 2018-11-20 14:54:34 -05:00
Matthew Piatetsky
6f8090eadb handle case when list of programs for course is empty 2018-11-20 13:11:33 -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
Brian Wilson
9e417fb5e4 Add creation of url from host and path. 2018-11-19 14:36:07 -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
edX Transifex Bot
52d89b2ec3 Update translations 2018-11-18 16:18:56 -05:00
Cali
7b0ade3c66 Merge pull request #19279 from edx/cstenson/add_partitions_metadata 
Add user partitions data to course metadata.
 2018-11-17 00:04:53 -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
Cali Stenson
ecb052125c Move get_user_partition_groups to partition_services to call 
from multiple contexts.
 2018-11-16 16:28:07 -05:00
Ayub
4826b69035 Merge pull request #19274 from edx/update-translations-16-nov 
Update translations
 2018-11-16 16:43:36 +05:00
ayub-khan
19f82fc3b7 Update translations 2018-11-16 15:24:38 +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
0fb25cdc63 Merge pull request #19271 from edx/rev-81/fix-errors-in-xblocks 
fix errors in drag and drop and ORA2 xblocks
 2018-11-15 16:13:14 -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