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

57090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bianca Severino
c95dc59356 Add function to InstructorService to retrieve proctoring_escalation_email 2021-01-25 10:05:27 -05:00
Alex Dusenbery
135e9acf5f Update edx-enterprise to 3.17.11 and edx-rbac to 1.4.1; Adds an optional applies_to_all_contexts field to the SystemWideRoleAssignment model. 2021-01-25 09:51:48 -05:00
Robert Raposa
2de62ccf3a Merge pull request #26152 from regisb/regisb/enable-annotation-linting 
Enable annotation linting with edx-lint
 2021-01-25 08:54:41 -05:00
Syed Muhammad Dawoud Sheraz Ali
4a2a6c04be Merge pull request #24800 from regisb/regisb/fix-transcript-upload-to-s3 
Fix TypeError during transcript upload to S3
 2021-01-25 17:20:04 +05:00
Régis Behmo
97399cf97c Fix TypeError during transcript upload to S3 
On a platform that is configured to upload video transcripts to S3
(`DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"`),
uploads from the studio fail with a TypeError: "Unicode-objects must be
encoded before hashing"

A full stacktrace of the issue can be found here:
https://sentry.overhang.io/share/issue/2249b6f67d794c7e986cc288758f4ebe/

This error is triggered by md5 hashing in the botocore library, which
itself is used by the S3Boto3Storage storage class. This error does not
occur with filesystem-based uploads because it does not perform checksum
verification. The reason why this error would not occur on edx.org is
unknown. Similar issues were already fixed from edxval.

To address this issue, we encode the transcript file content prior to
sending it to s3.
 2021-01-25 12:23:31 +01:00
Régis Behmo
f140cc0f15 Enable annotation linting with edx-lint 
We upgrade edx-lint to use the latest feature toggle and annotation custom
linter. Note that we do not yet make use of code annotation linting, typically
run with `code_annotations --lint ...`.

Note that we also fix new linting errors detected by the new checkers.
 2021-01-25 10:31:24 +01:00
Ahtisham Shahid
ed1156a690 Improved traces for new relic in CMS dashboard (#26126) 
* Improved traces for new relic in cms dashboard
 2021-01-25 14:15:54 +05:00
Usama Sadiq
5a09786cf3 Merge pull request #26142 from edx/testeng/bokchoy_auto_cache_update_cf1e6aeb39c0a811897f5ef92c7f5a34b83afa52 
Bokchoy Testing DB Cache update
 2021-01-23 21:18:13 +05:00
edX cache uploader bot
e5ebd2077d Updating Bokchoy testing database cache 2021-01-22 10:08:31 -05:00
David Ormsbee
a2fc100ebc Merge pull request #26135 from open-craft/libraries-v2-anon-ids-shim-fix 
[MNG-1904] Fix: update new runtime's runtime.anonymous_student_id to store in DB
 2021-01-22 10:03:42 -05:00
Waheed Ahmed
fc8f189084 Update Facebook color. 
Updated Facebook SSO button color acccording to their brand
guidelines.

VAN-296
 2021-01-22 17:59:58 +05:00
Waheed Ahmed
f6287694ae Keep enterprise user on monolith FE. 
If an enterprise customer is associated with the request,
keep the user on the monolith FE and do not redirect them to
MFE.

VAN-125
 2021-01-22 17:01:00 +05:00
Saad Yousaf
b5ef613707 Logo text for edge (#26100) 
* Logo text for edge

* Refactored code

Co-authored-by: Asad <asadazam93@gmail.com>
 2021-01-22 15:45:14 +05:00
Usama Sadiq
034a9f2e24 Merge pull request #26136 from edx/jenkins/upgrade-python-requirements-812cd50 
Python Requirements Update
 2021-01-22 14:33:14 +05:00
jawad khan
091b2bc1fa LEARNER-8097 
LEARNER-8097
Added self paced in course serializer
 2021-01-22 13:18:35 +05:00
edX requirements bot
5411debbe0 Updating Python Requirements 2021-01-21 23:46:23 -05:00
Braden MacDonald
ae16394ee5 Fix: update new runtime's runtime.anonymous_student_id to store in DB 
This addresses a longstanding TODO item to make runtime.anonymous_student_id for content libraries v2 work the same way as it does for XBlocks in regular courses, persisting the "context ID" (equivalent to course ID) to the database. This way, if SECRET KEY is changed, existing anonymous IDs will continue to work unchanged.

This is a potentially breaking change, but should mostly affect capa problems using external code graders or Matlab code input, and I'm not aware of any such usage of the new runtime / libraries v2.
 2021-01-21 15:38:53 -08:00
Michael Roytman
812cd504de Merge pull request #26130 from edx/mroytman/update-edx-proctoring-version-2.5.13 
update version of edx-proctoring library to 2.5.13
 2021-01-21 15:58:55 -05:00
Michael Roytman
d69bf444f3 update version of edx-proctoring library to 2.5.13 2021-01-21 12:18:39 -05:00
Matthew Piatetsky
0101eefe73 Merge pull request #26110 from edx/AA-497 
[AA-497] Only set due dates on subsections that contain graded assignments with a score and a nonzero weight
 2021-01-21 11:23:21 -05:00
Kyle McCormick
44d5060c60 Add setting for error'ing on deprecated imports 
Deprecated edx-platform import paths
(for example, `student` instead of
`common.djangoapps.student`) currently raise
warnings when used. We want to fully remove
support for those paths.

As an easily reversible way to initially remove
support, we add a new setting to LMS and Studio
called `ERROR_ON_DEPRECATED_EDX_PLATFORM_IMPORTS`,
defaulting to False. We set it to True for devstack
and will set it to True in Stage and Production
soon. If critical errors occur, we can easily
flip the setting back to False.
 2021-01-21 10:49:47 -05:00
Kyle McCormick
9d317c5c52 Fix patch of deprecated course_modes import path 
The correct path is `common.djangoapps.course_modes...`
 2021-01-21 10:49:47 -05:00
M. Zulqarnain
bfabc1ff41 BOM-2233 : Upgrade social-auth-core to > 4.0 (#26055) 
* Upgrade social-auth-core

* Fixing a test.

Co-authored-by: Usama Sadiq <usama.sadiq@arbisoft.com>
Co-authored-by: Awais Qureshi <awais.qureshi@arbisoft.com>
 2021-01-21 12:54:26 +05:00
edX requirements bot
8b56aaf2af Updating Python Requirements (#26125) 2021-01-21 12:40:50 +05:00
Zainab Amir
7737c67588 Add query param to account activation redirect (#26107) 2021-01-21 10:18:54 +05:00
Matthew Piatetsky
84ba4ec635 Only set due dates on subsections that contain graded assignments with a score and a nonzero weight 
Previously we were only checking the graded attribute which doesn't account for ungraded assignments
https://openedx.atlassian.net/browse/AA-497
 2021-01-20 16:30:20 -05:00
Bianca Severino
ff884e8b2c Merge pull request #26123 from edx/bseverino/proctoring-2.5.12 
Update edx-proctoring to 2.5.12
 2021-01-20 14:09:53 -05:00
stvn
5170fa5a58 Merge PR #26124 open-craft/kshitij/lti-xblock-upgrade 
* Commits:
  Bump version of lti-consumer-xblock to include fixed migrations
 2021-01-20 11:06:33 -08:00
Bianca Severino
17c21d007c Update edx-proctoring to 2.5.12 2021-01-20 12:34:43 -05:00
Kshitij Sobti
b502889b6d Bump version of lti-consumer-xblock to include fixed migrations from https://github.com/edx/xblock-lti-consumer/pull/136 2021-01-20 23:02:46 +05:30
Nathan Sprenkle
117a940db8 Upgrade staff-graded-xblock to 1.5 (#26122) 2021-01-20 12:06:43 -05:00
Sarina Canelake
57ff417f23 Merge pull request #25910 from open-craft/kshitij/lti-tab 
[BD-03] [TNL-7805] [BB-3371] LTI Discussion Tab
 2021-01-20 09:38:54 -05:00
Hammad Ahmad Waqas
edec511dc9 Merge pull request #26117 from edx/hammad/version-bump 
edx-enterprise version bump.
 2021-01-20 16:11:10 +05:00
edX cache uploader bot
64e06aff02 Updating Bokchoy testing database cache (#26118) 2021-01-20 16:02:43 +05:00
Kshitij Sobti
f54b3fdf12 Update dependencies to include lti-consumer-xblock 2021-01-20 16:26:22 +05:30
Kshitij Sobti
6769a280a9 Added a new LTI-based course tab, and LtiDiscussion tab 
This PR lays the groundwork for a an LTI tab that can embed any LTI1.1-based
tool as an course tab. It also adds another tab based on this LTI Tab that
offers special support for embedding LTI-based discussion tools in a course
tab. If enabled this will replace the existing discussion tab.
 2021-01-20 16:24:55 +05:30
HammadAhmadWaqas
222b5299b4 edx-enterprise version bump. 2021-01-20 15:37:38 +05:00
Usama Sadiq
ad4040ee59 Merge pull request #26115 from edx/jenkins/upgrade-python-requirements-1683d12 
Python Requirements Update
 2021-01-20 15:18:24 +05:00
Ali Akbar
3056f0074f Merge pull request #26113 from edx/IM/security-fixes-5-thresholds 
update thresholds after IM security fixes 5
 2021-01-20 14:20:00 +05:00
edX requirements bot
e312e403f7 Updating Python Requirements 2021-01-19 23:55:09 -05:00
Matt Hughes
1683d12819 Register ProctoredExam model for django admin 
This will help us flip mysterious cases where proctored exams are
marked inactive.

JIRA:MST-609
 2021-01-19 16:40:40 -05:00
Kyle McCormick
0fadd66d3f Upgrade xblock-poll from 1.10.0 to 1.10.2 (#26102) 
Pulls in:
* Translation corrections (1.10.1)
* Fix deprecated import, which is soon to be unsupported (1.10.2)
 2021-01-19 15:46:15 -05:00
Ali-D-Akbar
4f2db21363 update thresholds after IM security fixes 5 2021-01-20 00:36:37 +05:00
Diana Huang
6e3667688e Merge pull request #26111 from edx/diana/add-code-owner-mapping 
Add edx_sga to our code_owners mappings.
 2021-01-19 13:09:02 -05:00
David Ormsbee
1d028c9baa Merge pull request #25572 from open-craft/raul/import-export-boto3-support 
[SE-3530] Adds Boto3 support for Import/Export functionality
 2021-01-19 13:08:04 -05:00
David Ormsbee
ea5194d967 Merge pull request #25537 from open-craft/shimulch/bb-3158 
[MCKIN-26432] [BB-3158] Add Unit to breadcrumbs navigation
 2021-01-19 13:07:45 -05:00
Diana Huang
ea8907ca53 Add edx_sga to our code_owners mappings. 2021-01-19 11:23:08 -05:00
Kyle McCormick
03f023c6d7 Bump edx-enterprise from 3.17.7 to 3.17.9 (#26084) 
Pulls in:
* Degreed API endpoints (3.17.8)
* Fix deprecated third_party_auth import (3.17.9)
 2021-01-19 11:06:37 -05:00
Saad Yousaf
9bd79b45e3 Merge pull request #26109 from edx/revert-26052-saad/TNL-7361 
Revert "[TNL-7361] - Restrict Instructor Tab from masquerading user with student role."
 2021-01-19 20:34:23 +05:00
edx-pipeline-bot
fc95b735dc Merge pull request #26108 from edx/private_to_public_38e2a52 
Mergeback PR from private to public.
 2021-01-19 10:16:44 -05:00