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

57887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
6af0eb5c28 test: Ignore running tests from /common/lib/pytest_cache. 2021-03-02 23:55:48 +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
alangsto
0846e04f45 update exam attempt table css (#26802) 
Add hover for accordion

update edx-proctoring version
 2021-03-02 12:33:49 -05:00
Kyle McCormick
e792242b5f refactor!: remove redundant ENABLE_COURSEWARE_MICROFRONTEND toggle (#26792) 
The Django setting
FEATURES['ENABLE_COURSEWARE_MICROFRONTEND']
has been an additional gate to activating
usage of the Learning MFE for an Open edX
instance.

The toggle is redundant with the
`courseware.courseware_mfe`
Waffle flag. By removing it, we simplify our config
and simplify our path towards making the Learning MFE
the default courseware experience.

TNL-7796
 2021-03-02 11:36:43 -05:00
Usman Khalid
dd96a2aa72 Convert Course, Section and Sequence XModules to XBlocks. (#25965) 2021-03-02 10:29:33 -05:00
Bianca Severino
2dc4f35ce4 Merge pull request #26804 from edx/bseverino/proctoring-3.7.0 
[MST-666] Update edx-proctoring to 3.7.0
 2021-03-02 10:21:59 -05:00
Feanil Patel
7789ee8d6c Merge pull request #26788 from edx/feanil/fix_warning 
fix: Text comparison should be done with `==` not via is.
 2021-03-02 10:19:20 -05:00
Feanil Patel
6e4e7648a5 Merge pull request #26790 from edx/feanil/fix-annotations 
doc: Correctly annotate the setting name.
 2021-03-02 10:19:01 -05:00
Dillon Dumesnil
49b67d5a99 Merge pull request #26801 from edx/ddumesnil/aa-513-user-id-fix 
AA-513: Ensure user id exists before trying to send event
 2021-03-02 06:55:52 -08:00
Bianca Severino
5509e6dd42 Update edx-proctoring to 3.7.0 2021-03-02 09:43:11 -05:00
Dillon Dumesnil
aeb71250e9 AA-513: Ensure user id exists before trying to send event 
request.user.id could be None which ends up raising an error in
the analytics package we use.
 2021-03-02 09:22:12 -05:00
Awais Qureshi
53d9f66217 Merge pull request #26672 from edx/BOM-2374-entitlements 
Run Pyupgrade on entitlement.
 2021-03-02 18:08:03 +05:00
M. Zulqarnain
88471575ab refactor: pyupgrade in CMS (#26723) 2021-03-02 16:45:46 +05:00
M. Zulqarnain
e19ba34f5a pyupgrade on xblock_config app in CMS (#26710) 2021-03-02 16:45:33 +05:00
M. Zulqarnain
3a5be3b074 pyupgrade on course_creators, maintenance and models apps under CMS (#26709) 2021-03-02 16:45:20 +05:00
M. Zulqarnain
ba86198519 pyupgrade on verify_students app (#26648) 2021-03-02 16:45:01 +05:00
Awais Qureshi
378b5eb4b5 Merge branch 'master' into BOM-2374-entitlements 2021-03-02 16:35:30 +05:00
Awais Qureshi
29180d4b66 Merge pull request #26670 from edx/BOM-2375-student-pa2 
Run Pyupgrade on student folder.
 2021-03-02 16:30:36 +05:00
Zainab Amir
11791e25d4 VAN-367: Track optional and goals field usage (#26779) 2021-03-02 14:26:44 +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
edX requirements bot
a203a14a51 Updating Python Requirements (#26793) 2021-03-02 11:38:22 +05:00
Feanil Patel
d2343b1f07 doc: Correctly annotate the setting name. 
The `setting_name` annotation needed a space before it so that it's
picked up properly by the toggle annotations tooling.
 2021-03-01 16:35:41 -05:00
Feanil Patel
8fa34d7974 fix: Text comparison should be done with == not via is. 
`is` will check if two objects are the same whereas `==` will check if
their values are the same which is what we want here.
 2021-03-01 15:38:24 -05:00
Matthew Piatetsky
fe8e959559 Merge pull request #26765 from edx/AA-304 
Check course outline and course date toggles in addition to courseware toggle for streak
 2021-03-01 11:02:50 -05:00
Dillon Dumesnil
7b1d4bcfc0 Merge pull request #26784 from edx/ddumesnil/update-entitlement-session-aa-682 
AA-682: Update the pseudo session fallback session
 2021-03-01 07:40:52 -08:00
Matthew Piatetsky
69ec9a2599 Check course home toggle in addition to courseware toggle 2021-03-01 09:40:02 -05:00
Dillon Dumesnil
8bbea7f89a AA-682: Update the pseudo session fallback session 
There was a bug where the earliest course returned for a pseudo session
(when there were no available sessions) might not exist in modulestore and
would cause a 500 error. The data problem is another issue that will need to
be fixed, but by switching to the most recent session in this scenario, we believe
we will reduce the likelihood of this error occurring. We also believe the most
recent session is a better return value than the first ever session.
 2021-03-01 09:33:31 -05:00
Usama Sadiq
7f6cabbf98 Ran pyupgrade on lms/djangoapps (#26519) 
* refactor: ran pyupgrade on lms/djangoapps/bulk_enroll
Co-authored-by: M. Zulqarnain <muhammad.zulqarnain@arbisoft.com>
 2021-03-01 17:13:18 +05:00
Jawayria
e5b06ef959 Merge pull request #26503 from edx/jawayria/bom-2351-4 
BOM-2351: Removed unused imports from common/djangoapps/{track, util}
 2021-03-01 17:01:19 +05:00
Usama Sadiq
cfb911966a Merge pull request #26520 from edx/usamasadiq/bom-2355-pyupgrade 
Ran pyupgrade on lms/djangoapps-I
 2021-03-01 15:54:01 +05:00
Zainab Amir
773810e176 VAN-367: Capture optional fields usage (#26775) 2021-03-01 13:03:07 +05:00
edX requirements bot
491e682335 Updating Python Requirements (#26773) 2021-03-01 12:05:47 +05:00
Ned Batchelder
981ecb675e build: private.txt files weren't handled properly 
The requirements/edx/private.txt file is for dev's own private package
needs.  There are two installation mechanisms in edx-platform, and
neither handled the file properly:

- `paver install_prereqs` had the wrong file name.  The file was moved
  almost three years ago, and paver wasn't kept up.

- `make requirements` used `private.*` which included private.in, which
  pip-sync balks at.
 2021-02-26 22:19:47 -05:00
Carla Duarte
02c46fc016 Merge pull request #26764 from edx/ddumesnil/segment-logout-aa-513 
AA-513: Updating to segment instead of backend event
 2021-02-26 14:03:40 -05:00
Dillon Dumesnil
7f796e1be1 AA-513: Updating to segment instead of backend event 2021-02-26 13:36:21 -05:00
Braden MacDonald
2bcee44568 Merge pull request #26708 from jramnai/tsd-display_histograms_to_staff 
[TSD] add annotations for DISPLAY_HISTOGRAMS_TO_STAFF feature flag
 2021-02-26 10:18:15 -08:00
Braden MacDonald
3a0e4138ee Merge pull request #26561 from edx/ziafazal/annotation_EMBARGO 
[TSD] Added annotations for EMBARGO feature flag
 2021-02-26 10:17:36 -08:00
stvn
e52de0414a Merge PR #26752 cleanup/middleware-classes 
* Commits:
  docs: Update references to Django MIDDLEWARE_CLASSES
 2021-02-26 08:58:42 -08:00
Dillon Dumesnil
5e2bbd88d5 Merge pull request #26763 from edx/ddumesnil/segment-logout-aa-513 
AA-513: Add segment event for logout
 2021-02-26 08:04:35 -08:00
Dillon Dumesnil
82d3367923 AA-513: Add segment event for logout 2021-02-26 10:19:13 -05:00
Carla Duarte
a90453b060 Merge pull request #26743 from edx/ciduarte/AA-684 
AA-684: expose can_load_courseware to Course Home MFE
 2021-02-26 09:21:02 -05:00
Jawayria
9e768785d0 Merge pull request #26499 from edx/jawayria/bom-2351-2 
BOM-2351: Removed unused imports from common/djangoapps/student
 2021-02-26 16:59:21 +05:00
Jawayria
3296619b7b Merge pull request #26534 from edx/jawayria/bom-2351-7 
BOM-2351: Removed unused imports from common/test
 2021-02-26 16:19:37 +05:00
Jawayria
9c8ef996a3 Merge pull request #26484 from edx/jawayria/bom-2351-1 
BOM-2351: Removed unused imports from common/djangoapps/{course_modes…
 2021-02-26 16:17:32 +05:00
Awais Qureshi
66d5bd7a23 Merge pull request #26757 from edx/revert-http-pretty 
Revert http-pretty it seems few tests becomes flaky.
 2021-02-26 15:48:46 +05:00
Awais Qureshi
115f3b48d7 Revert http-pretty it seems few tests becomes flaky. 2021-02-26 15:12:36 +05:00
Usama Sadiq
27984285a7 Merge pull request #26502 from edx/usamasadiq/bom-2353-pyupgrade 
Ran pyupgrade on lms/djangoapps
 2021-02-26 14:07:17 +05:00