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

57145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Tuchfarber
606311bd69 Merge pull request #25777 from open-craft/shimulch/bb-3306 
[BB-3306] Customizable Certificate Date Format
 2021-01-27 16:01:29 -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
Alex Dusenbery
86e74bef1f Upgrade edx-enterprise to 3.17.12 | Conditionally allows the deletion of individual EnterpriseCourseEnrollment and related LicensedEnterpriseCourseEnrollment records via the Django Admin site, so that site admins can manually delete enterprise enrollments that were created in error. 
This is only allowed if a Django settings feature flag is set to True.
 2021-01-27 15:15:00 -05: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
Alex Dusenbery
aed3d8cbfc Define a ALLOW_ADMIN_ENTERPRISE_COURSE_ENROLLMENT_DELETION feature flag, so that site admins are allowed to delete EnterpriseCourseEnrollment records. 2021-01-27 14:25:53 -05:00
Ned Batchelder
7dae0b9c5a Merge pull request #25949 from mitodl/pdpinch/pr-template 
add PR template
 2021-01-27 12:39:38 -05:00
Tim McCormack
4359be96f3 Tweaks to anonymous user ID code path monitoring (#26194) 
- Use different attribute names for new and old versions of function
- Use a shorter name overall (for ease of analysis)
- Add monitor for fetched-existing case
- Only record computed-stored if `get_or_create` succeeds, but also
  break it into created vs. fetched cases by checking return value
- Correct name of monitor in `except` clause -- that should only happen
  for a race inside `get_or_create` itself. There's a different race in
  the `anonymous_uid_for_user` between fetch and compute/save.
- Other name tweaks

ARCHBOM-1674
 2021-01-27 16:12:55 +00:00
Alexander J Sheehan
ff87c45de8 Merge pull request #26180 from edx/alex-sheehan-edx/gradebook-view-bugfix 
Adding collected structure to the course grade read
 2021-01-27 09:58:07 -05:00
Tim McCormack
e0e03dec5f Use more appropriate hash when making tracking ID; document SECRET_KEY use (#26134) 
- Make it easier to rotate `SECRET_KEY` by documenting this usage
  for both sensitivity and rotation process. (ARCHBOM-1676).
- Just use a hash of the secret rather than HMAC + MD5. We're not
  authenticating a message, so HMAC isn't really needed -- it just needs
  to be unique, deterministic, and irreversible. SHAKE allows generation
  of an arbitrary length hash without needing to truncate.

Also, rename tracking session ID generator for clarity -- there's no
encryption happening here.

Add additional test for existing claim of uniqueness.
 2021-01-27 14:13:42 +00:00
alangsto
68706bd5df upgrade proctoring version (#26189) 2021-01-27 08:39:40 -05: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
Ahtisham Shahid
428402e370 changed instructor dashboard waffle type form course to legacy (#26128) 
* changed instructor dashboard waffle type form course to legacy
 2021-01-27 13:10:38 +05:00
edX requirements bot
761e470b30 Updating Python Requirements (#26184) 2021-01-27 12:32:20 +05:00
Ahtisham Shahid
3dfb25cb5d Updated/refactored logs in auth exchange (#26077) 2021-01-27 12:12:28 +05:00
alangsto
a2a1998d26 update proctoring version (#26181) 2021-01-26 18:41:24 -05:00
Alexander Sheehan
12fd104ef2 adding collected structure to the course grade read to prevent attempts to subscript a null object 2021-01-26 16:33:51 -05:00
alangsto
ad5aa6cd7a downgrade proctoring version (#26178) 2021-01-26 16:20:12 -05:00
Christie Rice
b1e5695acf MICROBA-921 Move emit_certificate_event() to utils (#26133) 2021-01-26 14:41:34 -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
Robert Raposa
2d7a8358ef Merge pull request #26172 from regisb/regisb/fix-cms-annotation 
[BD-21] Fix `ERROR_ON_DEPRECATED_EDX_PLATFORM_IMPORTS` code annotation
 2021-01-26 13:09:30 -05:00
Tim McCormack
0fbd134c55 Add monitoring for anonymous user ID code paths (#26176) 
For ARCHBOM-1674 we need more information on how often save=False is
actually used vs. other code paths.
 2021-01-26 18:06:39 +00:00
Robert Raposa
b86a78da43 Merge pull request #26165 from open-craft/raul/tsd-xblock_runtime_v2_ephemeral_data_cache 
[TSD] adds annotations for XBLOCK_RUNTIME_V2_EPHEMERAL_DATA_CACHE
 2021-01-26 13:04:03 -05:00
Raul Gallegos
7bae76b093 improves description for XBLOCK_RUNTIME_V2_EPHEMERAL_DATA_CACHE 2021-01-26 12:10:38 -05:00
Raul Gallegos
9d506ca5a6 adds annotations for XBLOCK_RUNTIME_V2_EPHEMERAL_DATA_CACHE 2021-01-26 12:10:38 -05:00
alangsto
7f8cb8e616 Updated proctoring version (#26173) 2021-01-26 11:41:56 -05:00
Régis Behmo
5f8a2952e9 Fix ERROR_ON_DEPRECATED_EDX_PLATFORM_IMPORTS code annotation 
This annotation was causing a linting failure, and a TypeError down the road in
the feature toggle report processing step by
edx-toggles/scripts/feature_toggle_report.py.
 2021-01-26 14:25:49 +01:00
Peter Pinch
bfeafd4815 docs: add PR template 
Co-authored-by: Ned Batchelder <ned@nedbatchelder.com>
 2021-01-26 08:15:13 -05:00
Awais Jibran
eeed906017 Merge pull request #25994 from edx/aj/bulk-email-provide-logo-from-bkend 
Provide logo URL from the backend
 2021-01-26 15:02:56 +05:00
Usama Sadiq
6d403698d1 Merge pull request #26166 from edx/jenkins/upgrade-python-requirements-70cc6d8 
Python Requirements Update
 2021-01-26 14:44:33 +05:00
Ali Akbar
4537aa6124 Merge pull request #26022 from edx/aakbar/PROD-2218 
disable xsslint
 2021-01-26 14:31:19 +05:00
Saad Yousaf
78adfc6c6c [TNL-7803] - Add text to new Edge logo (#26097) 
* edge logo

* Refactored code

* Refactored code

Co-authored-by: Asad <asadazam93@gmail.com>
 2021-01-26 14:14:54 +05:00
edX requirements bot
19b531596d Updating Python Requirements 2021-01-25 23:55:14 -05:00
Michael Roytman
70cc6d8608 Merge pull request #26160 from edx/mroytman/update-edx-proctoring-version-2.6.1 
update version of edx-proctoring library to 2.6.1
 2021-01-25 15:44:16 -05:00
Christie Rice
32e0eb2edc MICROBA-921 Standardize imports within the certificates app for consistency (#26131) 2021-01-25 15:29:42 -05:00
Robert Raposa
99e09a1dd8 Merge pull request #26161 from edx/robrap/docathon-annotate-capture-cookie-sizes 
[TSD] annotate cookie monitoring toggle
 2021-01-25 15:21:14 -05:00
Christie Rice
8888f27d29 MICROBA-921 Fix typos (#26132) 
* MICROBA-921 fix typos

* Fix quality
 2021-01-25 15:05:22 -05:00
Robert Raposa
cf626667d6 annotate cookie monitoring toggle 
* Annotate cookie monitoring toggle and settings.
* Refactor to replace LegacyWaffleFlag.
 2021-01-25 14:42:44 -05:00
Robert Raposa
c946b76aa2 Merge pull request #26159 from open-craft/raul/tsd-xblock_field_data_wrappers 
[TSD] adds settings annotations for XBLOCK_FIELD_DATA_WRAPPERS
 2021-01-25 14:40:56 -05:00
Feanil Patel
c5913a58d5 Add an ADR about secret key usage. (#26146) 
Add an ADR about secret key usage.

Don't use secret keys for use cases which would result in breakage upon
rotation and which might slow down the act of rotation.
 2021-01-25 13:35:49 -05:00
Michael Roytman
fd22dec067 update version of edx-proctoring library to 2.6.1 2021-01-25 13:23:50 -05:00
Usama Sadiq
8ff0269fb5 Merge pull request #26157 from edx/testeng/bokchoy_auto_cache_update_11f54215ae1688b61955053e6c6800362ab1315e 
Bokchoy Testing DB Cache update
 2021-01-25 23:19:07 +05:00
Raul Gallegos
b9922325ad adds settings annotations for XBLOCK_FIELD_DATA_WRAPPERS 2021-01-25 12:52:50 -05:00
Michael Roytman
0912b44254 Merge pull request #26147 from edx/mroytman/MST-545-pass-proctoring-improvements-toggle-edx-proctoring 
pass value of EXAM_RESUME_PROCTORING_IMPROVEMENTS feature toggle to ed…
 2021-01-25 12:21:55 -05:00
Carla Duarte
f03797a882 Merge pull request #26158 from edx/ciduarte/AA-568 
AA-568: dates widget styling
 2021-01-25 11:15:14 -05:00
Carla Duarte
878f9a3064 AA-568: dates widget styling 2021-01-25 10:51:20 -05:00
edX cache uploader bot
feab79fc73 Updating Bokchoy testing database cache 2021-01-25 10:37:56 -05:00
Bianca Severino
fdee99c459 Merge pull request #26088 from edx/bseverino/contentstore-service 
[MST-543] Allow InstructorService to retrieve proctoring escalation email
 2021-01-25 10:33:18 -05:00
Bianca Severino
c95dc59356 Add function to InstructorService to retrieve proctoring_escalation_email 2021-01-25 10:05:27 -05:00
Michael Roytman
71cc2e18e5 pass value of EXAM_RESUME_PROCTORING_IMPROVEMENTS feature toggle to edx-proctoring Javascript via the student-proctored-exam-container div 2021-01-25 09:59:44 -05:00