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

9270 Commits

Author SHA1 Message Date
Kyle McCormick
5557194af1 revert: BOM-2378 (B) : pyupgrade in common/lib (#26943) 
Reverts #26731

The code in common/lib/capa/capa/safe_exec needs
to remain Python 3.5-compatible, since edx-sandbox
(ie codejail) is still running Python 3.5.
 2021-03-10 15:01:09 -05:00
Jeff Witt
ac4c1c37b7 feat: Allow HTML video player to use 2x playback speed 
LEARNER-8247

Co-Authored-By: Sarina Canelake <sarina@edx.org>
 2021-03-10 09:37:35 -05:00
M. Zulqarnain
b4614d75f0 BOM-2378 (C) : pyupgrade in common/lib/xmodule (#26736) 
* refactor: pyupgrade in common/lib/xmodule

Co-authored-by: Usama Sadiq <usama.sadiq@arbisoft.com>
 2021-03-10 17:56:39 +05:00
M. Zulqarnain
8e8420dd46 BOM-2378 (B) : pyupgrade in common/lib (#26731) 
* refactor: pyupgrade on common/lib

Co-authored-by: Usama Sadiq <usama.sadiq@arbisoft.com>
 2021-03-10 17:56:24 +05:00
M. Zulqarnain
deb7f5b026 refactor: pyupgrade in common/lib/xmodule (#26780) 2021-03-10 17:56:07 +05:00
M. Zulqarnain
8aec103447 refactor: pyupgrade in common/lib/xmodule (#26781) 2021-03-10 17:55:49 +05:00
Usman Khalid
e624a8f4ac Convert CustomTagModule to CustomTagBlock. 2021-03-09 09:27:43 -05:00
Usman Khalid
48290cf837 Convert PollModule to PollBlock. 2021-03-09 09:27:43 -05:00
Kyle McCormick
9aefd6f986 style: django-not-configured is not a sensible lint-amnesty value (#26862) 
django-not-configured is an error raised by pylint (with
the pylint-django plugin) when it's not correctly configured.

We should not be applying lint amnesty for such a violation.
 2021-03-05 08:11:58 -05:00
Jawayria
c5e5b307b5 Merge pull request #26507 from edx/jawayria/bom-2351-6 
BOM-2351: Removed unused imports from common/lib/xmodule
 2021-03-04 20:36:46 +05:00
Usman Khalid
0e7664fbce test: Fix failing pytest asserts in GradesheetTest.test_weighted_grading. 2021-03-03 18:49:01 +05:00
Usman Khalid
8a8dbee340 test: Fix assertstore and modulestore tests failing because of missing equality functions. 
https://github.com/edx/edx-platform/pull/26530 updated the tests to use pytest
assertions instead of unittest assertionss. However, some tests depended on custom
equality functions being set up in the test classes. These tests have been updated
to explicitly do the needed comparisons.
 2021-03-03 18:49:01 +05:00
Usman Khalid
f35eed4e4c test: Fix test_capa_module.py::ProblemBlockTest::test_demand_hint_logging. 2021-03-03 16:39:34 +05:00
Jawayria
097613e8b9 BOM-2351: Removed unused imports from common/lib/xmodule 2021-03-03 14:33:54 +05:00
Usman Khalid
7441702ade test: The exception on the pytest ExceptionInfo object can be accessed on the value attribute. 2021-03-03 01:03:36 +05:00
Usman Khalid
1beb4f38a1 test: Remove the invalid pylint message from common/lib/pytest.ini 
This auto-added pylint message is preventing tests in common/lib from running.
 2021-03-02 23:55:48 +05:00
Usman Khalid
dd96a2aa72 Convert Course, Section and Sequence XModules to XBlocks. (#25965) 2021-03-02 10:29:33 -05:00
Jawayria
9e31096ec5 Merge pull request #26505 from edx/jawayria/bom-2351-5 
BOM-2351: Removed unused imports from common/lib/{capa, safe_lxml, sy…
 2021-03-02 13:29:10 +05:00
usamasadiq
96f0915b0f Fixed new pylint warnings. 
use generator in any/all()
disable not-callable warnings
disable no-member warnings
Suppressed smaller pylint warnings
Pin edx-proctoring==3.5.0
 2021-02-22 16:36:53 +05:00
Maarten
469faaa62d Only add the scrollbar when the width of the screen is small enough (xs) to highlight the whole sequence-nav item (#26405) 2021-02-19 16:11:25 -05:00
Aarif
cce5c9ef1a replaced unittest assertions pytest assertions (#26530) 2021-02-19 12:25:51 +05:00
Ali Akbar
096bfe95dc Merge pull request #223 from edx/IM/security-fixes-12 
Incident Management Security Fixes 12
 2021-02-17 01:31:49 +05:00
Usman Khalid
62ed654b31 Convert LTIModule into LTIBlock. (#25713) 2021-02-16 09:09:13 -05:00
Jawayria
4fc7b2f640 BOM-2351: Removed unused imports from common/lib/{capa, safe_lxml, symmath, conftest.py} 2021-02-15 13:21:19 +05:00
Carla Duarte
8d2d78dc61 AA-650: block deprecated keys from course home MFE 2021-02-08 13:00:36 -05:00
Ali-D-Akbar
f87507bdfa PROD-2253 2021-02-08 23:00:17 +05:00
Usama Sadiq
1bb06669e3 Merge branch 'master' into usamasadiq/bom-2312-pylint-amnesty-common-lib 2021-02-08 18:26:15 +05:00
Usama Sadiq
90666a6231 Merge pull request #26311 from edx/usamasadiq/bom-2305-pylint-amnesty 
Applied pylint-amnesty
 2021-02-08 18:23:34 +05:00
usamasadiq
1175838fa5 fix pep8 warnings 2021-02-08 16:08:01 +05:00
usamasadiq
7bbde8f0f5 Applied pylint-amnesty 2021-02-08 13:00:22 +05:00
Matthew Piatetsky
b91f720b7e Merge pull request #26293 from edx/AA-613 
[AA-613] Return content type gate for staff users when masquerading as the Learner in Audit or Learner in Limited Access Roles
 2021-02-05 09:18:34 -05:00
Matthew Piatetsky
ae7d0a1ed8 Return content type gate for staff users when masquerading as the Learner in Audit or Learner in Limited Access Roles 
This is necessary to display the content type gate in the UI
AA-613
 2021-02-04 17:34:16 -05:00
Ned Batchelder
ceb0933f18 Merge pull request #26278 from edx/nedbat/less-specific 
fix: Studio setting descriptions shouldn't mention edx.org
 2021-02-04 16:59:57 -05:00
usamasadiq
bbc386752f Applied pylint-amnesty 2021-02-04 18:52:10 +05:00
Ali Akbar
c5b0056b30 Merge pull request #215 from edx/IM/security-fixes-6 
Incident Management Security Fixes 6
 2021-02-04 00:03:38 +05:00
Jawayria
12065a30e0 pylint-amnesty on common/lib 2021-02-02 20:12:07 +05:00
Ned Batchelder
70ddda4e71 fix: messages shouldn't name edx.org 
These messages appear on 1000 other sites that are not publishing to
edx.org.  There's no need to be so specific.
 2021-02-01 08:00:11 -05:00
usamasadiq
dbfec8ee3c Remove nonrequired conditions 2021-02-01 16:30:47 +05:00
Ali-D-Akbar
d6f6dad9a9 PROD-2205 2021-02-01 15:32:27 +05:00
Ali-D-Akbar
3c41404190 PROD-2116 2021-02-01 15:32:27 +05:00
Ali Akbar
0aa1b8f2bf Merge pull request #214 from edx/IM/security-fixes-5 
Incident Management Security Fixes 5
 2021-01-29 16:55:08 +05:00
Matthew Piatetsky
ff839c364e Merge pull request #26143 from edx/AA-613 
[AA-613] Add contains_content_type_gated_content attribute to display items in the Sequence Metadata API.
 2021-01-28 12:28:05 -05:00
Matthew Piatetsky
84fb4679c9 Add contains_content_type_gated_content attribute to display items in the Sequence Metadata API. This attribute is used to display the content type gating paywall in frontend-app-learning. 
Also, refactor existing timed exam code that checks for content_type_gated_content in a sequence to make it try with the new code
AA-613
 2021-01-28 12:00:53 -05:00
stvn
b55a3f9680 Merge PR #26200 fix/mfe-rollout/anonymous-access 
* Commits:
  fix: Fix KeyError in vertical_block
 2021-01-27 12:19:20 -08:00
stvn
e09a5c9d94 fix: Fix KeyError in vertical_block 
This now mimics the way this is (safely) done in the sequence module [1].

References:
- [1] 5f94a082ce/common/lib/xmodule/xmodule/seq_module.py (L657-L658)
 2021-01-27 11:40:13 -08:00
Muhammad Soban Javed
d26a59eb67 import task decorator from celery APP instance in CMS (#25953) 
* import task decorator from celery APP instance instead of celery package in CMS

* replaced task decorator with shared_task in cms and common

* Fixed import of shared_task

* Fixed import
 2021-01-27 18:35:11 +05:00
Manjinder Singh
2723e0e2bd [ARCHBOM-1645] Modifying anonymous_id_for_user() to handly SECRET_KEY rotation (#26162) 
These changes were initially made to make it easier to do SECRET_KEY rotations.  Along the way, we found it made sense to refractor the code as well.

Changes made:
- changed get_to_create to create because now the code should only get to this block when a write is necessary
- added a lookup for anonymous_user_id. This is to return an existing anonymous_user_id rather than calculating. This will mitigate the results of SECRET_KEY rotation.
- Added monitoring to help us make better decisions: should we not sue SECRET_KEY, performance considerations...
- put old function behind toggle in case something goes wrong in production with new code
- refractoring function structure for better understanding
 2021-01-27 07:23:19 -05:00
Kyle McCormick
e3cfaab487 Merge pull request #25955 from open-craft/symbolist/convert-hidden-module-to-xblock 
[BD-04] [SE-3708] Convert HiddenDescriptor to an XBlock.
 2021-01-26 13:56:06 -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
Ali-D-Akbar
752e0b918d PROD-2145 2021-01-20 00:42:34 +05:00