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

57204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Raposa
a34e209ba5 Merge pull request #26226 from eduNEXT/lmm/student.courseenrollment_admin 
[TSD] annotations for student.courseenrollment_admin
 2021-01-29 10:44:56 -05:00
Robert Raposa
22a1ad5f47 Merge pull request #26164 from open-craft/raul/tsd-xblock-select_function 
[TSD] adds annotations for XBLOCK_SELECT_FUNCTION
 2021-01-29 10:42:20 -05:00
Christie Rice
3638005326 MICROBA-921 Add certificate allowlist (#26129) 2021-01-29 10:22:07 -05:00
Feanil Patel
855b08bf11 Merge pull request #26210 from edx/feanil/xblock_handler_token_peppers 
Change how xBlock URLs are generated to be able to rotate SECRET_KEY
 2021-01-29 10:06:36 -05:00
alangsto
e1441f9699 updated edx-proctoring version (#26250) 2021-01-29 10:01:32 -05:00
edx-pipeline-bot
3048cb7a85 Merge pull request #26249 from edx/private_to_public_0aa1b8f 
Mergeback PR from private to public.
 2021-01-29 09:01:36 -05:00
Luis Moreno
a1664d2fd8 feat: Move student.courseenrollment_admin from LegacyWaffleSwitch t a WaffleSwitch and add annotations 2021-01-29 09:31:02 -04:00
Usama Sadiq
79c3e81d08 Merge pull request #26247 from edx/revert-26171-zulqarnain-bom2245 
Revert "BOM-2245 : Unpin python-dateutil"
 2021-01-29 18:11:47 +05:00
Raul Gallegos
24f528cfa6 adds annotations for XBLOCK_SELECT_FUNCTION 
improves the setting_description for XBLOCK_SELECT_FUNCTION

removes extra setting_description
 2021-01-29 07:57:23 -05:00
M. Zulqarnain
550691f0ac Revert "Unpin python-dateutil (#26171)" 
This reverts commit 0b32f0a3ec.
 2021-01-29 17:51:18 +05:00
Saad Yousaf
87054578a5 Merge pull request #26154 from edx/saad/TNL-7361-followup 
[TNL-7361] - Fix for instructor tab visible in learner role when masquerading.
 2021-01-29 17:31:28 +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
M. Zulqarnain
0b32f0a3ec Unpin python-dateutil (#26171) 2021-01-29 16:10:40 +05:00
SaadYousaf
0a5148211b fix for instructor tab visible in learner role when masquerading. 2021-01-29 15:57:37 +05:00
edX cache uploader bot
2f994a9b21 Updating Bokchoy testing database cache (#26225) 2021-01-29 14:56:13 +05:00
Usama Sadiq
0b08001bb9 Merge pull request #26237 from edx/jenkins/upgrade-python-requirements-27defab 
Python Requirements Update
 2021-01-29 14:48:34 +05:00
Adeel Ehsan
1e0aad46c8 Merge pull request #26103 from edx/aehsan/van-300/logistration-renamed-to-authn 
Logistration MFE renamed to authn
 2021-01-29 13:57:43 +05:00
adeelehsan
55d2a4f897 Logistration MFE renamed to authn 
VAN-300
 2021-01-29 11:37:54 +05:00
edX requirements bot
69f939097b Updating Python Requirements 2021-01-28 23:45:57 -05:00
Matt Tuchfarber
27defaba2f Merge pull request #26228 from edx/tuchfarber/fix_mb_redirection 
Fix dashboard coaching redirect
 2021-01-28 16:50:40 -05:00
Matt Tuchfarber
a54ef27306 Fix dashboard coaching redirect 2021-01-28 16:20:56 -05:00
Feanil Patel
415dfe469b test: Add tests for XBLOCK_HANDLER_TOKEN_KEYS logic. 
This tests the various steps of the rotation process work as we expect.

We set the reference time explicitly due to the bug we found in the
hashing logic which will be fixed in a future ticket.
 2021-01-28 15:08:22 -05:00
Feanil Patel
ceb8b3ac51 feat: Code to use a new set of keys for xblock handlers. 
The keys will fallback to the Django SECRET_KEY if it's not set or is an
empty list. Instructions for the rotation process are in a comment near
the usage of the new keys in openedx/core/djangoapps/xblock/utils.py.
 2021-01-28 15:08:22 -05:00
Feanil Patel
07d11128e3 test: Add baseline tests for secure tokens for xblock handlers. 
These tests did not exist so we add them first before making changes.

Add the __init__.py file to make test imports work properly.
ie. To solve https://github.com/pytest-dev/pytest/issues/774

More useful info on how that works here:
https://docs.pytest.org/en/latest/goodpractices.html#choosing-a-test-layout-import-rules
 2021-01-28 15:06:35 -05:00
Alex Dusenbery
27790141f3 Upgrade edx-enterprise to 3.17.14 | Add enterprise_customer field to the SystemWideEnterpriseUserRoleAssignment model, and updates Django Admin definitions around same. 2021-01-28 14:01:44 -05:00
Kyle McCormick
13bbab895e Bump django-config-models to 2.1.1 (#26219) 
Pulls in a fix for a deprecated import of
`util.memcache.safe_key`.
 2021-01-28 13:52:31 -05:00
alangsto
7a2299a2c3 upgrade edx-proctoring version (#26222) 2021-01-28 13:12:14 -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
David Ormsbee
4fde69441c Fix build: use @shared_task for update_outline_from_modulestore_task (#26216) 
Update to make update_outline_from_modulestore_task use @shared_task
and @set_code_owner_attribute.
 2021-01-28 11:22:39 -05:00
David Ormsbee
5353324c80 Merge pull request #26145 from edx/ormsbee/course-outline-publish-tnl-7733 
Push Course Outlines to learning_sequences on publish.
 2021-01-28 10:21:11 -05:00
David Ormsbee
d531d38ec7 Fix formatting on interapp APIs extension ADR. 
The numbered lists were not written correctly.
 2021-01-28 09:56:38 -05:00
David Ormsbee
669677c78a Push Course Outlines to learning_sequences on publish. 
The learning_sequences app has its own model for Course Outlines.
Prior to this commit, these course outlines were only populated by
a management command in the learning_sequences app that queried
modulestore. This commit does a few things:

1. Move the update_course_outline command to live in contentstore
   (i.e. Studio). This makes learning_sequences unaware of
   modulestore, and makes it easier for us to extract it from
   edx-platform (or to plug in different kinds of course outlines).
2. Add tests.
3. Add performance and debug logging to course outline creation.
4. Make course outline creation happen every time a course publish
   happens.

This will allow us to start collecting data about how long building
course outlines takes, and get error reporting around any content
edge cases that break the course outline code.
 2021-01-28 09:56:28 -05:00
Albert (AJ) St. Aubin
1927ea234a [MICROBA-952] Updating CourseEntitlements Admin to disallow changes to 
order number
.
 2021-01-28 08:55:53 -05:00
Jawayria
f1c786b526 Merge pull request #26174 from edx/lint-amnesty 
Applied pylint-amnesty to lms/djangoapps/badges
 2021-01-28 17:30:12 +05:00
jawad khan
cb6f348959 LEARNER-8194 
LEARNER-8194
Added self paced in mobile api enrolment api
 2021-01-28 13:49:05 +05:00
edX requirements bot
9d66db0b5d Updating Python Requirements (#26204) 2021-01-28 12:57:37 +05:00
Awais Jibran
ab60371009 Merge pull request #26187 from edx/aj/fix-studio-favicon 
Update studio favicon
 2021-01-28 12:39:02 +05:00
Robert Raposa
6666ac3b85 Merge pull request #26163 from open-craft/raul/tsd-xblock_settings 
[TSD] adds annotations for XBLOCK_SETTINGS
 2021-01-27 17:36:26 -05:00
Robert Raposa
78c2389aa4 Merge pull request #26167 from jramnai/tsd-default_mobile_available 
[TSD] add toggle annotations for DEFAULT_MOBILE_AVAILABLE
 2021-01-27 16:47:41 -05:00
Carla Duarte
50572e158d Merge pull request #26179 from edx/ciduarte/start-course 
AA-568: fix start course bug
 2021-01-27 16:02:54 -05:00
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
Carla Duarte
d97b058c5d AA-568: fix start course bug 2021-01-27 15:29:21 -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