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

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Chen
4c5d56ef06 MST-682 Add external_user_key to the student profile CSV (#27091) 
* MST-682 Add external_user_key to the student profile CSV
This is a request from some Masters school partners. They would like to download the student enrolled list with the Masters external_user_key data referenced. This way, the schools can properly match the students enrolled in the course with the students enrolled through Masters enrollment system
 2021-03-22 14:25:34 -04:00
Daniel Francis
777bb633c5 fix: Stop rendering Visibility and Move buttons on libraries (#26885) 
We're fixing an error that appears when you click the "edit access"
button on an XBlock in the library page.

Libraries in the "Add library" page shouldn't have the accessibility
config icon. Access settings for libraries are changed at the top, on
Settings > User Access. When clicking the access-button (the cog) on a
Library, an error appears. This is known to happen on koa.master and
open-release/juniper.3.

This happens due to the way XBlocks are rendered; as they get rendered
initially, the previews are unaware of whether they're part of a
library. We can confirm this by refreshing the page, this makes the
button disappear.

This fix removes the cogwheel when the XBlock is part of a library.
This doesn't affect the XBlocks imported to courses because those are
rendered on a Randomized Content XBlock, which does have its access
options.

Authored by: Daniel Francis <daniel.francis@opencraft.com>
 2021-03-22 13:39:09 -04:00
Calen Pennington
91b74b7fd3 Merge pull request #23457 from open-craft/agrendalath/bb-2063-fix-marking-blocks-as-completed-on-course-outline-page-upstream 
[BB-2063] Calculate completion for custom blocks on the Course Outline page
 2021-03-22 13:33:18 -04:00
Azan Bin Zahid
ca6914c1f2 fix: move xss-lint disable comment to correct place 2021-03-22 21:20:26 +05:00
Agrendalath
e571693455 Support EXCLUDED blocks in Block Completion Transformer 
For now only the discussion blocks were supported. If we had a custom XBlock that specified `completion_mode = XBlockCompletionMode.EXCLUDED`, then it could never be marked as completed on the course outline page, despite being marked as such inside the learning sequence.
 2021-03-22 16:21:43 +01:00
Agrendalath
5a27b5df39 Calculate completion for custom blocks on the Course Outline page 
This adds support for displaying completion on the course outline page, to remove the discrepancies between this view and the learning sequence. It also simplifies course outline page by reusing existing APIs for determining completion state and finding the "Resume block"'s target.
 2021-03-22 16:21:32 +01:00
Ahtisham Shahid
da30f24108 Fixed Html escaping in course name in API (#27103) 
* Fixed Html escaping in course name in API
 2021-03-22 19:52:34 +05:00
Bianca Severino
ed63ffbb50 Merge pull request #27086 from edx/bseverino/proctoring-escalation-email 
Allow `get_proctoring_escalation_email` to use a course key object
 2021-03-22 10:12:45 -04:00
Christie Rice
43f32a8f6b feat: Add initial certificate generation checks for updated (V2) course certificates (#27090) 
MICROBA-923
 2021-03-22 10:07:21 -04:00
Robert Raposa
f9c11f061f Merge pull request #27059 from open-craft/nizar/update_block_structure_toggles_annotations 
docs: updates ticket links for block structure settings and toggles
 2021-03-22 09:29:48 -04:00
M. Zulqarnain
40a987d9d0 refactor: pyupgrade on LMS (#26851) 2021-03-22 17:51:23 +05:00
M. Zulqarnain
91d33611b1 refactor: pyupgrade in profile_images, programs, safe_sessions (#26953) 2021-03-22 17:51:13 +05:00
Robert Raposa
1c19fbf3b3 Merge pull request #26325 from regisb/regisb/migrate-toggle-state-report 
[BD-21] Migrate toggle state report to edx-toggles
 2021-03-22 08:27:49 -04:00
Awais Qureshi
c43cdd0cee Merge pull request #27100 from edx/revert-27097-revert-27087-fixing-toggles 
Revert "Revert "temp: Apply pylint amnesy ( Type annotation-invalid-choice )""
 2021-03-22 17:26:23 +05:00
Awais Jibran
2ec17309d0 Code Refactor (#27101) 2021-03-22 16:07:06 +05:00
Awais Jibran
5f773d326d Add missing import logs. (#27066) 2021-03-22 15:28:13 +05:00
Awais Qureshi
23bcd6f05d revert: Reverts #27097 
#27097 reverted the pylint amnesty change. After reverting the ubuntu20 deployment, now this can be deployed again.
 2021-03-22 15:17:22 +05:00
edX requirements bot
41c1d237eb Python Requirements Update (#27094) 
* Updating Python Requirements

* fix proctoring test

Co-authored-by: Zulqarnain <muhammad.zulqarnain@arbisoft.com>
 2021-03-22 15:15:46 +05:00
Nadeem Shahzad
44897fe4b8 Merge pull request #27097 from edx/revert-27087-fixing-toggles 
Revert "temp: Apply pylint amnesy ( Type annotation-invalid-choice )"
 2021-03-22 13:08:45 +05:00
Awais Qureshi
20c39b267e Revert "temp: Apply pylint amnesy ( Type annotation-invalid-choice )" 2021-03-22 12:47:43 +05:00
Awais Qureshi
60cd0c1295 Merge pull request #27087 from edx/fixing-toggles 
temp: Apply pylint amnesy ( Type annotation-invalid-choice )
 2021-03-22 11:19:50 +05:00
Sofiane Bébert
5d7cd3d278 docs: annotate auto_certificate_generation (#26770) 2021-03-19 16:01:55 -04:00
Awais Qureshi
4611398429 temp: Apply pylint amnesy. 2021-03-19 23:01:31 +05:00
Usama Sadiq
aa618c460c refactor: remove unused-imports (#27083) 2021-03-19 22:42:14 +05:00
Tim McCormack
7c18840f3d chore: Unpin pillow and upgrade Python requirements (#27081) 
Pillow was pinned for Python 3.5 support, which we no longer need.

- https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst
- https://facelessuser.github.io/soupsieve/about/changelog/
 2021-03-19 16:56:01 +00:00
Régis Behmo
78c152975b refactor: migrate toggle state report to edx_toggles 
The toggle state report could not be shared with other IDAs. Here we make use
of the newly available report from edx_toggles, and customize it to add data
from WaffleFlagCourseOverrideModel.
 2021-03-19 17:14:14 +01:00
Régis Behmo
ae7d4994bf fix: deprecated waffle switch usage in test method 2021-03-19 17:08:57 +01:00
Bianca Severino
d7c944c387 Allow get_proctoring_escalation_email to use a course key object 2021-03-19 11:24:27 -04:00
Bianca Severino
7a7c87d277 Merge pull request #27080 from edx/bseverino/proctoring-3.7.12 
Revert edx-proctoring to 3.7.12
 2021-03-19 09:59:46 -04:00
Saqib
b367b276c9 docs: add annotations for ENABLE_LTI_PROVIDER feature flag (#27040) 2021-03-19 09:42:24 -04:00
Bianca Severino
557029b0db Revert edx-proctoring to 3.7.12 2021-03-19 09:38:43 -04:00
Lael Birch
bbade4f342 Merge pull request #27076 from edx/ENT-4333 
Bump edx-enterprise
 2021-03-19 09:13:40 -04:00
Sarina Canelake
2342f04447 Merge pull request #26435 from open-craft/shimulch/bb-3624-upstream 
Fix missing email context values and pass site configuration to better multi-site customization
 2021-03-19 08:42:38 -04:00
Lael Birch
20cc87f5ef Bump edx-enterprise 2021-03-19 08:26:06 -04:00
Awais Qureshi
51e719b15a Merge pull request #27075 from edx/fixing-unused-imports 
refactor: remove unused imports.
 2021-03-19 16:19:40 +05:00
Awais Qureshi
9c30125e69 Merge pull request #27054 from edx/third-party-auth-3 
Pyupgrade in common/djangoapps/third-party-modes part3
 2021-03-19 16:14:49 +05:00
Awais Qureshi
68c0153dbe Merge pull request #27053 from edx/third-party-auth-2 
Pyupgrade in common/djangoapps/third-party-modes part2
 2021-03-19 16:07:59 +05:00
edX requirements bot
65e025c248 Updating Python Requirements (#27070) 2021-03-19 15:53:28 +05:00
Awais Qureshi
81bab4d01a Pyupgrade in common/djangoapps/third-party-auth/tests. 2021-03-19 15:39:48 +05:00
Awais Qureshi
275e0c7527 refactor: remove unused imports. 2021-03-19 15:30:01 +05:00
Awais Qureshi
683e6f9aba refactor: remove unused imports. 2021-03-19 15:22:03 +05:00
Awais Qureshi
05a5f5954b refactor: remove unused imports. 2021-03-19 10:15:59 +00:00
Awais Qureshi
a2f5a46a68 refactor: Pyupgrade in common/djangoapps/third-party-auth/tests. 2021-03-19 12:40:15 +05:00
Awais Jibran
c377d87c54 Throw an error message if the assertion fails (#27063) 2021-03-19 12:23:26 +05:00
Shimul Chowdhury
e942f12adc Add missing context platform_name and contact_mailing_address. And pass 
site configuration to email context.
 2021-03-19 10:05:49 +06:00
Christie Rice
fa15afb062 fix: Update logging (#27065) 
MICROBA-923
 2021-03-18 15:00:52 -04:00
Feanil Patel
1d99bb2eb3 Merge pull request #27062 from edx/feanil/more_logging 
fix: Add more info in warning log messages.
 2021-03-18 12:33:44 -04:00
Alexander J Sheehan
73b48757b0 Merge pull request #27045 from edx/alex-sheehan-edx/bumping-enterprise-bulk-enrollment 
bumping enterprise version to 3.18.7
 2021-03-18 12:12:19 -04:00
Feanil Patel
416407fd73 fix: Add more info in warning log messages. 
If this happens, it's usefule to know what main view code was being
targetd so that we can more easily investigate what might have caused
this issue.

Add a new custom attribute 'safe_sessions.user_mismatch' to find
requests that had this issue in our monitoring system.
 2021-03-18 11:33:08 -04:00
Bianca Severino
14fdb75c15 Merge pull request #27041 from edx/bseverino/proctoring-3.7.13 
Update edx-proctoring to 3.7.13
 2021-03-18 11:11:06 -04:00