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

49177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dave St.Germain
5b8c5d4500 Master's certs will automatically be generated 2019-04-05 12:02:38 -04:00
Dave St.Germain
66744598df Master's track will result in a verified cert 2019-04-05 12:02:38 -04:00
Dave St.Germain
d379ffc383 Added masters to cert modes 2019-04-05 12:02:38 -04:00
Jolyon Bloomfield
f2a0bd666e Fixing quality 2019-04-05 12:00:04 -04:00
Hammad Ahmad Waqas
974a937f70 session is replaced with cache to hold data_sharing_consent_needed 
flag value
added signal to destroy data_sharing_consent_needed flag if user is
is enrolled in enterprise course.
 2019-04-05 18:06:54 +05:00
Hasnain Naveed
6acf53173f Merge pull request #20048 from edx/hasnain-naveed/WL-1903 
WL-1903 | Error handling for incorrect configuration of SAML Auth.
 2019-04-05 15:55:03 +05:00
Jolyon Bloomfield
8adaca66d1 INCR-200 Migrate common/djangoapps/util/tests and migrations 2019-04-05 00:57:46 -04:00
Jolyon Bloomfield
b66e367520 INCR-199 migrate openedx/core/djangoapps/schedules 2019-04-05 00:43:41 -04:00
Alex Dusenbery
cddf32560d Cleanup after tests. 2019-04-04 20:27:27 -04:00
Michael Youngstrom
b8e8f7bc28 Merge pull request #20148 from edx/youngstrom/upgrade-job 
Upgrade post pip compile script
 2019-04-04 12:24:20 -04:00
Michael Roytman
138c6e63e8 Merge pull request #20155 from edx/mroytman/bump-edx-proctoring-version-1.6.1 
bump version of edx-proctoring package to 1.6.1
 2019-04-04 12:24:09 -04:00
Michael Roytman
bcfd74618a bump version of edx-proctoring package to 1.6.1 2019-04-04 10:49:22 -04:00
Jolyon Bloomfield
b8e1478ff0 INCR-126 Modernize common/djangoapps/student/management/tests (#20151) 2019-04-04 10:08:02 -04:00
Michael Youngstrom
79663a5465 Fix post pip compile script 2019-04-03 16:37:44 -04:00
Feanil Patel
c4b0a6bfcf Merge pull request #20145 from edx/release-mergeback-to-master 
Merge release back to master
 2019-04-03 13:12:23 -07:00
Matthew Piatetsky
06d3fb9c9e Merge pull request #20117 from edx/REVMI-41 
[REVMI-41] Test changes made to course blocks API
 2019-04-03 15:21:32 -04:00
Jolyon Bloomfield
26351509ee INCR-196 Migrating common/djanjoapps/student/signals and views (#20138) 2019-04-03 15:16:55 -04:00
Alex Dusenbery
eff3a07005 Add a course_modes REST API. 2019-04-03 14:44:00 -04:00
Feanil Patel
dc6b6fe196 Merge branch 'master' into release-mergeback-to-master 2019-04-03 11:31:30 -07:00
Matthew Piatetsky
f69811ee91 add course blocks api check to _assert_block_is_gated function 2019-04-03 14:13:59 -04:00
Matthew Piatetsky
e14c5d69ec Merge pull request #20091 from edx/check_for_denial_reason 
handle missing fields on access denied blocks
 2019-04-03 14:13:03 -04:00
edx-pipeline-bot
d770189ba0 Merge pull request #20143 from edx/release-mergeback-to-master 
Merge release back to master
 2019-04-03 23:07:28 +05:00
Feanil Patel
0b6968589c Merge commit 'cdc42026b8b329c0d5b3737a9c1f7695e8963e9a' into feanil/new_rc 
Doing this as a merge because the release is backlogged and we need
to make smaller increments onto the RC which have some changes that
don't land on master till much later.

The change we're missing on master is an upgrade of the newrelic plugin
that fixes a major memory issues for us.
 2019-04-03 09:43:42 -07:00