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

49201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
e395efcb5d make upgrade (except for python3-saml, which had problems at 1.6.0) 2019-04-10 19:12:29 -04:00
Ned Batchelder
b666e54196 edx-lint --> 1.1.2 2019-04-10 13:56:40 -04:00
Matt Drayer
2430136fcd Merge pull request #20208 from edx/mattdrayer/ENT-1751 
ENT-1751: Downgrade log level from "warning" to "info" for expected consent gating workflow.
 2019-04-10 12:26:52 -04:00
Matt Drayer
04aa7495ea Downgrade log level from warning to info for expected consent gating workflow. 2019-04-10 11:22:19 -04:00
noraiz-anwar
4202f1f02a version update 2019-04-10 19:21:26 +05:00
noraiz-anwar
ab6c2c22f4 update ora version 2019-04-10 19:21:26 +05:00
noraiz-anwar
eeb89c457d pass grade feeze info to xblocks 2019-04-10 19:21:26 +05:00
Thomas Tracy
afdd6c5a89 Merge pull request #20070 from edx/ttracy/ENT-957-Oauth2-slug-change 
ENT-957: Fix's bug that does not allow an Oauth2 provider to have a different slug and backend_name
 2019-04-10 09:47:57 -04:00
Thomas Tracy
29fb1588a9 Another pip issue. 2019-04-10 09:02:50 -04:00
irfanuddinahmad
6d473e2d07 Merge pull request #20166 from edx/iahmad/ENT-1784-SYSTEM_TO_FEATURE_ROLE_MAPPING-setting 
ENT-1784-SYSTEM_TO_FEATURE_ROLE_MAPPING-setting
 2019-04-10 16:02:23 +05:00
irfanuddinahmad
5cb8d7a4ce ENT-1784-SYSTEM_TO_FEATURE_ROLE_MAPPING-setting 2019-04-10 15:24:14 +05:00
Zainab Amir
bd6de34fe8 Merge pull request #20182 from edx/zamir/LEARNER_6734_change_attribute_in_logging 
Change attribute in ProgramDataExtender log warning
 2019-04-10 13:56:36 +05:00
Zainab Amir
97e26785e3 Change attribute in ProgramDataExtender log warning 
The variable course_run is not an attribute of object
ProgramDataExtender and should not be accessed using self.

LEARNER-6734
 2019-04-10 12:11:31 +05:00
Thomas Tracy
f59dc6c820 Fix's bug that does not allow an Oauth2 provider to have different slug and backend_names 
Added comment to explain model change.

Removed accidental whitespace.

Another pip issue.
 2019-04-09 19:59:55 -04:00
Matthew Piatetsky
faab3e954a Merge pull request #20198 from edx/revert-20190-revert_both 
Undo revert of switching course api default behavior to new version
 2019-04-09 16:50:04 -04:00
edX cache uploader bot
b54bd1cae3 Bokchoy db cache update (#20199) 
* Updating migrations for new waffle switch: enterprise_role_based_access_control
 2019-04-09 16:16:46 -04:00
Matthew Piatetsky
51b991c128 fix bug and add temporary waffle flag 2019-04-09 15:38:55 -04:00
Matt Hughes
1afc4496f9 Merge pull request #20197 from edx/matthugs/pin-vendor-proctoring-code 
Pin proctoring plugin code
 2019-04-09 13:33:41 -04:00
Brittney Exline
650263716b Merge pull request #20194 from edx/bexline/bump_edx_enterprise 
ENT-1730 Upgrading edx-enterprise to 1.4.0
 2019-04-09 09:29:49 -06:00
Matthew Piatetsky
064f041276 Revert "Revert both" 2019-04-09 11:04:10 -04:00
Matt Hughes
4461804dfe Pin proctoring plugin code 
We intend for subsequent versions to be reviewed manually before
finding their way into edx-platform proper; this prevents subsequent
releases from finding their way in without human intervention
 2019-04-09 10:24:34 -04:00
Brittney Exline
a330e6539a ENT-1730 Upgrading edx-enterprise to 1.4.0 2019-04-09 08:08:42 -06:00
David Ormsbee
c8532c16dd Merge pull request #20084 from jolyonb/examfix 
Hiding overall grades in progress page for a sequential when problem scores are hidden
 2019-04-09 09:37:11 -04:00
Muhammad Ammar
16c232a3bd Merge pull request #20183 from edx/ammar/bump-edx-enterprise-version 
bump edx-enterprise version to 1.3.11
 2019-04-09 11:25:39 +05:00
Calen Pennington
bf302ccca1 Merge pull request #20187 from cpennington/fix-access-expiry-upsell-link 
Allow Access Expiry emails to users w/o dynamic pacing deadlines, and only bucket valid users
 2019-04-08 16:01:22 -04:00
Calen Pennington
e31598ae9f Allow Access Expiry emails to users w/o dynamic pacing deadlines, and only bucket valid users 2019-04-08 15:20:14 -04:00
Chris Pappas
a0332148f4 Merge pull request #20170 from edx/cpappas/ENT-1556-tweaks 
ENT-1556 | Updating settings files to grab SYSTEM_WIDE_ROLE_CLASSES f…
 2019-04-08 13:27:41 -04:00
Matthew Piatetsky
7dcf2ba03e Merge pull request #20190 from edx/revert_both 
Revert both
 2019-04-08 13:26:49 -04:00
Matthew Piatetsky
be9eb46364 Revert "handle missing fields on access denied blocks" 
This reverts commit 418540b713.
 2019-04-08 12:13:30 -04:00
Matthew Piatetsky
9de5e65b75 Revert "add course blocks api check to _assert_block_is_gated function" 
This reverts commit f69811ee91.
 2019-04-08 12:12:48 -04:00
Stu Young
0f420b874f Merge pull request #20178 from edx/testeng/bokchoy_auto_cache_update_fcddedc7988d790cf5d8e72f9a76efba6daf94e8 
Bokchoy db cache update
 2019-04-08 11:38:36 -04:00
edx-cache-uploader-bot
ca3fb17406 Updating migrations 2019-04-08 10:56:30 -04:00
Michael Youngstrom
7841cbaa96 Merge pull request #20161 from jolyonb/incr-199 
INCR-199 migrate openedx/core/djangoapps/schedules
 2019-04-08 10:28:56 -04:00
muhammad-ammar
613236779c bump edx-enterprise version to 1.3.11 2019-04-08 18:46:25 +05:00
Zainab Amir
490a62c447 Merge pull request #20180 from edx/zamir/LEARNER_5408_get_current_site_object 
LEARNER-5408 Get current site by ID
 2019-04-08 15:55:29 +05:00
Muhammad Ammar
07696ef5dd Merge pull request #20122 from edx/ammar/add-default-settings-for_system_wide_role_classes 
add default settings for system_wide_role_classes
 2019-04-08 13:41:34 +05:00
Zainab Amir
2471c12cc4 Get current site by ID 
Getting current site by NAME was failing on stage.

LEARNER-5408
 2019-04-08 12:54:34 +05:00
Hammad Ahmad Waqas
3955dab574 Merge pull request #20164 from edx/hammad/WL-1905 
WL-1905 |  Some learners not showing up in report | Missing Data Sharing Consent Redirection
 2019-04-08 12:39:43 +05:00
muhammad-ammar
1a4de0a85d add default settings for system_wide_role_classes 2019-04-08 11:11:59 +05:00
Nimisha Asthagiri
e780eae04c Merge pull request #20177 from edx/arch/annotate-profile-mfe-toggle 
Learner Profile Toggles: Annotate and Remove outdated ones
 2019-04-07 23:21:17 -04:00
edX Transifex Bot
07207cfa9e fix(i18n): update translations 2019-04-07 17:28:37 -04:00
Dave St.Germain
900b0de825 Merge pull request #20167 from edx/dcs/incr-147 
Modernize course_groups
 2019-04-07 12:33:34 -04:00
Nimisha Asthagiri
47759427ba Learner Profile Toggles: Annotate and Remove outdated ones 
ARCH-453
 2019-04-07 11:30:35 -04:00
Christopher Pappas
59a1d6ab41 ENT-1556 | Updating settings files to grab SYSTEM_WIDE_ROLE_CLASSES from config as expected 
Moving rbac settings above plugins

Moving the setting above plugins in common.py for the lms and cms as well
 2019-04-05 17:27:13 -04:00
Alan Zarembok
1311100b29 Merge pull request #20173 from edx/azarembok/fix-video-rewrite-2 
PROD-101: Do not rewrite URL for videos that do not have a video id.
 2019-04-05 16:17:31 -04:00
Alex Dusenbery
d134a435d5 Add get_queryset method to CourseModesView; cleanup tests again 2019-04-05 16:12:35 -04:00
Alan Zarembok
f9a5d93ce4 PROD-101: Do not rewrite URL for videos that do not have a video id. 2019-04-05 15:29:17 -04:00
Dave St.Germain
4c6ff94b54 Merge pull request #20154 from edx/dcs/masters-cert 
Added masters to cert modes
 2019-04-05 14:28:25 -04:00
Michael Youngstrom
68ab69a46b Merge pull request #20162 from jolyonb/incr-200 
INCR-200 Migrate common/djangoapps/util/tests and migrations
 2019-04-05 14:04:08 -04:00
Dave St.Germain
66e104b816 Modernize course_groups 2019-04-05 14:01:42 -04:00