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

18767 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
Justin Hynes
1afdd71c53 Merge pull request #26921 from edx/jhynes/microba-1025_update_mngmt_cmd 
MICROBA-1025 | Update cert_whitelist management command
 2021-03-10 08:03:19 -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
edX cache uploader bot
9bfa56e27b Updating Bokchoy testing database cache (#26929) 2021-03-10 13:13:37 +05:00
Adeel Khan
725cd3f083 Fix button/title text for; 
1) Account activation email.
2) Password reset email.
3) Password reset success.

VAN-272
 2021-03-10 00:47:49 +05:00
Justin Hynes
32685a7999 MICROBA-1025 | Update cert_whitelist.py management command 
[MICROBA-1025]
- Update management command to use the same logic that the Instructor Dashboard uses
- Fix bug in management command where processing stopped when encountering a user that did not exist
- Add more logging
- Add and update tests where needed
 2021-03-09 14:45:44 -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
Awais Qureshi
1ab5d4dfed Merge pull request #26671 from edx/BOM-2374-edxmako 
Run Pyupgrade on edxmako.
 2021-03-09 18:35:14 +05:00
M. Zulqarnain
a664067323 refactor: pyupgrade in common/tests (#26725) 2021-03-09 18:03:34 +05:00
Awais Qureshi
f0cac0c09d Merge pull request #26893 from edx/BOM-2375-student-1 
BOM-2375-student-part1
 2021-03-09 17:52:30 +05:00
M. Zulqarnain
42eacaf8de refactor: pyupgrade in common/util + xblock_django (#26724) 2021-03-09 16:49:51 +05:00
edX cache uploader bot
1310f9ed70 Updating Bokchoy testing database cache (#26906) 2021-03-09 14:19:10 +05:00
Kyle McCormick
9b37e7d0fe refactor: centralize checks for canonical courseware experience & URL (#26815) 
Centralize the logic for choosing between
MFE and Legacy-frontend courseware within
three new functions:
* courseware_mfe_is_active
* courseware_mfe_is_visible
* courseware_legacy_is_visible

This allows us to create another new function:
* get_courseware_url
which can be called anywhere in LMS/Studio
to get the canonical URL to courseware
content (whether it be MFE or Legacy).

In future commits we we begin using
get_courseware_url throughout the platform.

TNL-7796
 2021-03-08 15:24:16 -05:00
Felipe Montoya
72fba562f8 Merge pull request #26477 from eduNEXT/MJG/Change_max_uername_len 
feat: Changed username max_length to the specified by django
 2021-03-08 15:15:49 -05:00
Awais Qureshi
b907c3d289 BOM-2375-student-part1 
pyupgrade in student app.
 2021-03-08 23:16:11 +05:00
Awais Qureshi
a980145164 BOM-2375-student-part1 
pyupgrade in student app.
 2021-03-08 22:21:37 +05:00
edX cache uploader bot
aecf6f1d51 Updating Bokchoy testing database cache (#26896) 2021-03-08 21:04:33 +05:00
Adeel Ehsan
5fcf88f31e Merge pull request #26869 from edx/aehsan/van-390/datetimestamp_added_for_account_activation_event 
datetimestamp added for account activation event
 2021-03-08 19:59:43 +05:00
Awais Qureshi
8168a3a322 Merge pull request #26673 from edx/BOM-2374-pipelinemako 
Run Pyupgrade on pipeline mako.
 2021-03-08 18:39:32 +05:00
Awais Qureshi
6832c95d8e Merge pull request #26706 from edx/BOM-2376-terrain 
Run Pyupgrade on terrain
 2021-03-08 18:38:19 +05:00
Awais Qureshi
2dcaf9d5a6 BOM-2375-student-part1 
pyupgrade in student app.
 2021-03-08 18:29:25 +05:00
Zainab Amir
a39befb548 VAN-113: Add error code for registration workflow (#26821) 2021-03-08 18:09:26 +05:00
adeelehsan
4d24f4c005 datetimestamp added for account activation event 
VAN-390
 2021-03-08 11:29:58 +05:00
Awais Qureshi
f1f1933ab4 BOM-2374 
Run Pyupgrade on edxmako.
 2021-03-05 18:17:41 +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
Justin Hynes
8155190511 Merge pull request #26857 from edx/jhynes/microba-1038_fix-removal-bug 
MICROBA-1038 | Don't check enrollment status when removing allowlist entries
 2021-03-05 08:02:03 -05:00
Awais Qureshi
875a06d2fc Merge pull request #26674 from edx/BOM-2373-course_action_state 
Run Pyupgrade on course-action-state.
 2021-03-05 17:24:13 +05:00
edX cache uploader bot
39b9099cdf Updating Bokchoy testing database cache (#26861) 2021-03-05 14:14:42 +05:00
Justin Hynes
a3a05bc440 MICROBA-1038 | Don't check enrollment status when removing allowlist entries 
[MICROBA-1038]
- Today, we check if a learner is actively enrolled in a course-run before we add or remove them from the Instructor Dashboard allow list. We ran into an issue where we couldn't remove an entry from the list because the learner is no longer actively enrolled in the course-run. Update instructor dashboard logic to only check enrollment status when _adding_ a learner to the allow list.
 2021-03-04 13:44:45 -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
Awais Qureshi
0fac7e7743 Merge pull request #26808 from open-craft/symbolist/fix-common-tests 
Fix running tests in common/lib.
 2021-03-03 23:50:01 +05:00
Sarina Canelake
e15e372233 Merge pull request #26772 from edx/sarina/DEPR-142-TNL-7522 
Remove the "role of users being enrolled" field from Instructor Dashboard
 2021-03-03 08:57:16 -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
Michael Terry
9570c1c72b feat: add 'external course updates' experiment flag 
When this flag is enabled, users will be 50/50 bucketed into an
experiment where users get course highlights and nudges from an
external service (like sailthru or braze) rather than from
edx-platform via ACE.

AA-661
 2021-03-02 14:51:45 -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
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
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
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
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