Commit Graph

58450 Commits

Author SHA1 Message Date
Alex Dusenbery
4098902c7a In SystemWideEnterpriseUserRoleAssignment, Use either applies_to_all_contexts or enterprise_customer
if they are True or non-null, respectively, in determining the result of get_context(),
but continue to return list of all linked enterprise customer UUIDs if not, (which is the current behavior).
This is a small step on our journey to explicitly defining user-role assignments.
2021-02-01 09:24:01 -05:00
Régis Behmo
d89868b56b fix: "Invalid type for parameter ContentType" error on js upload (#25957)
We are affected by this issue:
https://github.com/jazzband/django-pipeline/pull/297#issuecomment-264416094

In particular, this occurs when trying to upload js assets to s3, such
as with the Scorm xblock:
https://github.com/overhangio/openedx-scorm-xblock/issues/16

This issue is resolved by upgrading django-pipeline to 2.0.3+, as the
fix was introduced here:
https://github.com/jazzband/django-pipeline/pull/715
2021-02-01 09:08:54 -05:00
Jawayria
4b4fc89693 Applied pylint-amnesty to commerce 2021-02-01 18:56:15 +05:00
Jawayria
1c9e711054 Applied amnesty to ccx 2021-02-01 18:28:04 +05:00
Jawayria
bf1726ece9 Applied pylint-amnesty to branding 2021-02-01 13:05:31 +00:00
Ned Batchelder
70ddda4e71 fix: messages shouldn't name edx.org
These messages appear on 1000 other sites that are not publishing to
edx.org.  There's no need to be so specific.
2021-02-01 08:00:11 -05:00
Usama Sadiq
fdb50bcce8 Merge pull request #25811 from edx/usamasadiq/bom-1740-post-python38-cleanup
Post Python38 clean up process
2021-02-01 17:19:21 +05:00
usamasadiq
dbfec8ee3c Remove nonrequired conditions 2021-02-01 16:30:47 +05:00
usamasadiq
842c8cfa80 Update tox to remove python35 2021-02-01 16:25:19 +05:00
Ali-D-Akbar
533ef0d20e PROD-2248 2021-02-01 15:32:28 +05:00
Ali-D-Akbar
d6f6dad9a9 PROD-2205 2021-02-01 15:32:27 +05:00
Ali-D-Akbar
afb31f8049 PROD-1993 2021-02-01 15:32:27 +05:00
Ali-D-Akbar
1847bee0ad PROD-2084 2021-02-01 15:32:27 +05:00
Ali-D-Akbar
3c41404190 PROD-2116 2021-02-01 15:32:27 +05:00
Ali-D-Akbar
ab97902c5b PROD-2118 2021-02-01 15:32:27 +05:00
M. Zulqarnain
a5f6f682ee added pylint amnesty for bulk_enroll and course apps (#26246) 2021-02-01 13:58:59 +05:00
Ali Akbar
0f1dd46028 Merge pull request #26254 from edx/IM/security-fixes-6-thresholds
update threshold after IM security fixes 6
2021-02-01 13:19:50 +05:00
Ali-D-Akbar
5daea1401e update threshold after IM security fixes 6 2021-02-01 12:50:26 +05:00
Usama Sadiq
174f1ce787 Merge pull request #26271 from edx/jenkins/upgrade-python-requirements-ec5b78c
Python Requirements Update
2021-02-01 12:28:02 +05:00
Zaman Afzal
b99a64c385 ENT-3798 Multiple_SSO_Accounts_Association_to_SAML_User (#26170) 2021-02-01 11:44:12 +05:00
edX requirements bot
4666697db8 Updating Python Requirements 2021-01-31 23:55:19 -05:00
sarina
766157dbf3 Extend expiration of DEPRECATE_OLD_COURSE_KEYS_IN_STUDIO toggle TNL-7932 2021-01-30 12:20:24 -05:00
jfavellar90
8a2ba99551 Adding annotations for edx_notes_api settings 2021-01-29 15:35:08 -05:00
oliviaruizknott
8dc86227b9 MICROBA-905 Add django-simple-history to CertificateInvalidation model 2021-01-29 15:10:08 -05:00
Tim McCormack
ec5b78c625 doc: Clarify location and content of xblock token keys (#26259) 2021-01-29 19:44:26 +00:00
Feanil Patel
0c84904ae8 Merge pull request #26258 from edx/feanil/land_adr
Add Anonymous ID related ADR.
2021-01-29 14:38:59 -05:00
Feanil Patel
50efb38ccc Add Anonymous ID related ADR.
For a given course/user tuple, anonymous ID will not change once it
has been generated and saved.
2021-01-29 14:12:19 -05:00
Robert Raposa
0f3269037a Merge pull request #26256 from eduNEXT/TSD_enable_edx_notes_toggle
[TSD] Adding FEATURES[‘ENABLE_EDXNOTES’] annotations
2021-01-29 14:04:34 -05:00
Fox Danger Piacenti
a483a778f3 Add in standardized documentation for Badgr-related settings. 2021-01-29 12:45:01 -06:00
Gonzalo
fc3eee17c4 Adding FEATURES[‘ENABLE_EDXNOTES’] annotations
fix PEP8 W291 trailing whitespace

fix too long lines

adding specified django settings for edx-notes-api

change toggle_description

checking CI tests

Final corrections for ENABLE_EDXNOTES toggle
2021-01-29 13:05:00 -05:00
Robert Raposa
f6ef794e2a Merge pull request #26220 from jramnai/tsd-allow_email_address_change
[TSD] add annotations for ALLOW_EMAIL_ADDRESS_CHANGE feature flag
2021-01-29 12:20:01 -05:00
Felipe Montoya
7b0867e89a docs: add annotations for the DISABLE_LOGIN_BUTTON feature flag 2021-01-29 10:49:38 -05:00
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
jfavellar90
f7786e1abc Adding annotations for User Retirement settings 2021-01-29 09:47:05 -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
Jayram Nai
d54a13455a add annotations for ALLOW_COURSE_RERUNS feature flag 2021-01-29 18:37:54 +05:30
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
Jayram Nai
df2beaf267 add annotations for DISABLE_MOBILE_COURSE_AVAILABLE feature flag 2021-01-29 17:26:25 +05:30
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
Régis Behmo
d50086a84b Annotate course_experience.calendar_sync
This simply adds code annotations to the course waffle flag, but does not
affect behaviour.
2021-01-29 11:41:40 +01:00