Commit Graph

56373 Commits

Author SHA1 Message Date
Awais Jibran
3f4099a16f Merge pull request #25574 from edx/aj/branding/add-brand-edx-deps
Adding brand-edx.org as a dependency to edx-platform
2020-11-12 21:05:57 +05:00
Bianca Severino
60cab77c53 Merge pull request #25568 from edx/bseverino/idv-expiration
Set expiration_date field in IDVerificationAttempt model
2020-11-12 10:06:45 -05:00
Awais Jibran
2b1e239633 Adding brand-edx.org as a dependency to edx-platform 2020-11-12 19:45:34 +05:00
Albert (AJ) St. Aubin
9551b23d08 [MICROBA-721] Updates the notify_credentials job to run over new window 2020-11-12 08:27:03 -05:00
Saleem Latif
1858e28875 Merge pull request #25576 from edx/saleem-latif/ENT-3680
ENT-3680: Updated edx-enterprise version and only set user language preference on signup if it does not already exist.
2020-11-12 17:43:33 +05:00
edX requirements bot
9c22e31d0d Updating Python Requirements (#25578) 2020-11-12 11:28:14 +05:00
edX Transifex Bot
0194be2fac geoip2: update maxmind geolite country database 2020-11-11 16:13:58 -05:00
Saleem Latif
785b04888d Updated edx-enterprise version and only set user language preference on signup if it does not already exist. 2020-11-11 14:24:47 +05:00
edX cache uploader bot
3fb758a4c0 Updating Bokchoy testing database cache (#25560) 2020-11-11 13:08:20 +05:00
Felipe Montoya
d876a79f0e Merge pull request #25322 from aulasneo/BTR-15
Fix certificate sass assets collection for comprehensive themes
2020-11-10 16:41:38 -05:00
Kyle McCormick
73739189c5 Undo renames of common.djangoapps tasks (#25566)
When rolling out #25477, we dropped hundreds of email activation
tasks due to the renaming of student.send_activation_email
to common.djangoapps.student.send_activation_email,
and lost more when we rolled that PR back.
This happens because of blue/green deployment:
old workers are still online for a while after deploying,
so there is a period of time when the task names are mismatched.

To prevent this from happening again, this will make
it so the import changes don't change the names of
any of the Celery tasks.
2020-11-10 16:31:48 -05:00
Bianca Severino
56d7ff8017 Set expiration_date field in IDVerificationAttempt model 2020-11-10 15:29:47 -05:00
edX requirements bot
db32c28ecb Updating Python Requirements (#25563) 2020-11-10 15:00:07 -05:00
Bianca Severino
2e629c95a2 Merge pull request #25564 from edx/revert-25500-bseverino/idv-expiration
Revert "Set expiration_date field in IDVerificationAttempt model"
2020-11-10 14:59:55 -05:00
Dillon Dumesnil
8824a137dc Merge pull request #25562 from edx/ddumesnil/no-updates-after-end-aa-422
AA-422: Ensure learners are not receiving updates after course end
2020-11-10 11:41:21 -08:00
Bianca Severino
82e8592fbe Revert "Set expiration_date field in IDVerificationAttempt model" 2020-11-10 14:24:07 -05:00
Awais Qureshi
7201edb11d Revert "Update routing config" (#25536)" (#25549)" (#25553)" (#25561)
This reverts commit db4c3b1210.
2020-11-11 00:13:47 +05:00
Dillon Dumesnil
11f1347669 AA-422: Ensure learners are not receiving updates after course end 2020-11-10 14:07:31 -05:00
Awais Qureshi
db4c3b1210 Revert "Revert ""Update routing config" (#25536)" (#25549)" (#25553)
This reverts commit c1fe3c3a93.
2020-11-10 23:23:09 +05:00
Bianca Severino
0f6d94d1af Merge pull request #25500 from edx/bseverino/idv-expiration
Set expiration_date field in IDVerificationAttempt model
2020-11-10 13:08:41 -05:00
edX cache uploader bot
c49aa3a3e1 Updating Bokchoy testing database cache (#25559) 2020-11-10 21:50:28 +05:00
taliaedX
e1b85ce26d Merge pull request #25548 from edx/trhodes/enterprise-11092020
update edx-enterprise to latest release
2020-11-10 11:16:51 -05:00
Bianca Severino
3342524699 Update IDVerificationAttempt to use expiration_date field 2020-11-10 11:15:04 -05:00
Kyle McCormick
08ab6e0bc5 Fix import of common.djangoapps.util.date_utils (#25558) 2020-11-10 10:58:05 -05:00
Jansen Kantor
cd3a1e3870 upgrade ora and remove temporary pin (#25512) 2020-11-10 10:50:05 -05:00
Kyle McCormick
151bd13666 Use full names for common.djangoapps imports; warn when using old style (#25477)
* Generate common/djangoapps import shims for LMS
* Generate common/djangoapps import shims for Studio
* Stop appending project root to sys.path
* Stop appending common/djangoapps to sys.path
* Import from common.djangoapps.course_action_state instead of course_action_state
* Import from common.djangoapps.course_modes instead of course_modes
* Import from common.djangoapps.database_fixups instead of database_fixups
* Import from common.djangoapps.edxmako instead of edxmako
* Import from common.djangoapps.entitlements instead of entitlements
* Import from common.djangoapps.pipline_mako instead of pipeline_mako
* Import from common.djangoapps.static_replace instead of static_replace
* Import from common.djangoapps.student instead of student
* Import from common.djangoapps.terrain instead of terrain
* Import from common.djangoapps.third_party_auth instead of third_party_auth
* Import from common.djangoapps.track instead of track
* Import from common.djangoapps.util instead of util
* Import from common.djangoapps.xblock_django instead of xblock_django
* Add empty common/djangoapps/__init__.py to fix pytest collection
* Fix pylint formatting violations
* Exclude import_shims/ directory tree from linting
2020-11-10 07:02:01 -05:00
Ned Batchelder
a62c5dad49 Merge pull request #25542 from jramnai/squash-DeprecatedEdxPlatformImportWarning
Squash experiments DeprecatedEdxPlatformImportWarning
2020-11-10 06:46:24 -05:00
Usama Sadiq
2b683eb576 Merge pull request #25554 from edx/jenkins/upgrade-python-requirements-37353bf
Python Requirements Update
2020-11-10 14:19:59 +05:00
edX requirements bot
5f69024bed Updating Python Requirements 2020-11-10 02:29:56 -05:00
Robert Raposa
37353bf260 Merge pull request #25546 from regisb/regisb/fix-override-in-tests
[BD-21] Upgrade edx-completion and fix corresponding unit tests
2020-11-09 16:01:51 -05:00
Muhammad Soban Javed
c1fe3c3a93 Revert ""Update routing config" (#25536)" (#25549)
This reverts commit 39a22734c1.
2020-11-09 23:43:47 +05:00
Talia Rhodes
fa846b095d update edx-enterprise to latest release 2020-11-09 12:23:32 -05:00
JJ
e5e3fcdc1c [REV-1262] Skip enrolling already enrolled users on changes to the user (#25490)
Skip auto-enrolling users if they are already enrolled in their auto-enroll enabled courses to prevent downgrading users from paid course modes to audit/free course modes when they activate their account.
2020-11-09 10:41:58 -05:00
Régis Behmo
bad30a157e Upgrade edx-completion and fix corresponding unit tests
Some tests were still relying on deprecated
WaffleSwitchNamespace.override method, which was working before because
we were importing WaffleSwitchNamespace from waffle_utils.__init__. This
no longer works after we import WaffleSwitchNamespace from edx-toggles.
2020-11-09 16:14:50 +01:00
Kyle McCormick
688d3e7e46 Add logging slug to /debug/run_python safe exec call
Codejail logs all calls to `safe_exec` that include a `slug`.
Provide a `slug` in the Python-safe-exec debug view so that
usages of it are logged (for debugging purposes).
2020-11-09 09:56:27 -05:00
Kyle McCormick
07b0b71d2d Upgrade codejail from 3.1.1 to 3.1.3 for logging fix
TNL-7649
2020-11-09 09:56:27 -05:00
David Ormsbee
6c07fd0197 Merge pull request #25521 from mitodl/arslanashraf/193-sysadmin-auth-map-button
SysAdmin: Removed external authentication map repair button from User Tab
2020-11-09 09:23:39 -05:00
David Ormsbee
d05c250da3 Merge pull request #25474 from mitodl/umar/sysadmin-190
remove users listing and staff listing download csv from the sysadmin
2020-11-09 09:23:04 -05:00
Awais Qureshi
39a22734c1 "Update routing config" (#25536)
* Revert "Revert "Update routing config"

* Removed settings from lms/celery.py and cms/celery.py

* Moved settings import from top-level to function's scopes

Co-authored-by: Soban Javed <iamsobanjaved@gmail.com>
2020-11-09 19:06:55 +05:00
Waheed Ahmed
7c974675bb Remove maxlength attribute from register password field.
Pasting a longer password than allowed limit silently truncated to the
max value, resulting in creating an account with a password user is
unaware of because no validation error occurs.

VAN-86
2020-11-09 18:29:16 +05:00
adeel khan
eec8200761 Merge pull request #25507 from edx/adeel/van_105_adding_error_handling_for_login_page
Adds error message for logistration MFE.
2020-11-09 16:18:01 +05:00
Adeel Khan
51610e195e Adds error message for logistration MFE.
This adds new user facing locked out messaging
for logistration MFE.

VAN-105
2020-11-08 22:05:05 +05:00
Jayram Nai
24ee08dcbb Squash experiments DeprecatedEdxPlatformImportWarning 2020-11-07 08:01:55 +00:00
Manjinder Singh
c74b623948 Fixing code-annotations (#25539)
* Fixing code-annotations
2020-11-06 12:52:08 -05:00
Ned Batchelder
d96dedac7a Merge pull request #25511 from mitodl/asadiqbal08/sysadmin-deprecation-msg
asadiqbal08/Added a deprecation message for SysAdmin
2020-11-06 11:57:55 -05:00
jawad khan
04640bde1e Get last visited block id as user staus with version v1 (#25498)
Get last visited block id as user staus with version v1
VAN-85
2020-11-06 21:57:03 +05:00
Michael Terry
b2ba363f1e Merge pull request #25503 from edx/mikix/parent-access
AA-408: Treat group_access as inheritable in gating transformer
2020-11-06 11:40:58 -05:00
Robert Raposa
fe9395bd7a Merge pull request #25538 from regisb/regisb/improve-waffle-tests
[BD-21] Improve waffle_utils tests to not rely on internal API
2020-11-06 08:58:18 -05:00
Adeel Ehsan
0d9236524d Merge pull request #25398 from edx/aehsan/van-6/added_params_in_register_api
Added next and cours_id params in register endpoint
2020-11-06 18:15:09 +05:00
Kyle McCormick
2d46f12277 Upgrade codejail from 3.1.0 to 3.1.1 for improved logging (#25532)
We are curious whether async jail_code calls on Celery workers
have different resource limit configurations than synchronous
calls on LMS/Studio. We suspect it may be different
because codejail is configured via a Django Middleware, which
may not be initialized for Celery workers.

TNL-7649
2020-11-06 08:00:57 -05:00