Commit Graph

56983 Commits

Author SHA1 Message Date
Ned Batchelder
91d0c43cc8 Slightly clearer (#26060)
Without to_locale, it's not a locale anymore, so don't call it that.
2021-01-13 13:34:30 -05:00
Usama Sadiq
e4b8f56e26 Merge pull request #26031 from edx/djangorestfram-upgrade
Upgrade drf version.
2021-01-13 23:29:42 +05:00
edX requirements bot
3d7da3e739 Updating Python Requirements 2021-01-13 23:01:20 +05:00
Tim McCormack
129cd48266 Include security patch for pinning JWT signature algorithm in apple-id (#26059)
Extract from social-auth-core eed3007c4ccdbe959b1a3ac83102fe869d261948
2021-01-13 17:19:37 +00:00
Mahyar Damavand
e66ff41194 Change data-language format to ISO639-1 (#25278) 2021-01-13 12:07:59 -05:00
usamasadiq
8813272787 Remove djangorestframework constraint 2021-01-13 20:35:14 +05:00
Awais Qureshi
b6930adb21 Fixed deprecated warning. 2021-01-13 20:35:14 +05:00
Awais Qureshi
c978e5b204 Upgrade drf version. 2021-01-13 20:35:14 +05:00
Robert Raposa
e0aa459732 Merge pull request #26017 from regisb/regisb/refactor_set_request_cache
[BD-21] Get rid of calls to `set_request_cache_with_short_name`
2021-01-13 09:57:13 -05:00
Robert Raposa
50b705405e Merge pull request #26042 from regisb/regisb/update-waffle-util-adr
[BD-21] Document non-namespaced waffle classes in ADR
2021-01-13 09:56:35 -05:00
Robert Raposa
b2822ef3f0 Merge pull request #26041 from regisb/regisb/toggles-2.0.0
[BD-21] Upgrade edx-toggles to 2.0.0
2021-01-13 09:56:04 -05:00
David Ormsbee
098e047fce Merge pull request #25987 from edx/ormsbee/tnl-7636-xblock-access
Check sequence-level gating in render_xblock (TNL-7636)
2021-01-13 09:35:56 -05:00
edx-pipeline-bot
a41c7e2e1f Merge pull request #26054 from edx/private_to_public_780deee
Mergeback PR from private to public.
2021-01-13 07:13:14 -05:00
Ahtisham Shahid
780deeed7a Merge pull request #217 from edx/ahtisham/PROD-1916-p
Error incase of disabled user social login
2021-01-13 16:24:02 +05:00
edX requirements bot
bba0e1723a Updating Python Requirements (#26049) 2021-01-13 16:12:04 +05:00
edX Transifex Bot
5d1934725d geoip2: update maxmind geolite country database 2021-01-13 04:52:41 -05:00
Saad Yousaf
cf8c0bbec7 Merge pull request #26028 from edx/saad/TNL-7820
[TNL-7820] - remove important rule for links on hover.
2021-01-13 12:02:41 +05:00
Adam Stankiewicz
7561079b34 bump edx-enterprise to 3.17.5 (#26048) 2021-01-12 17:15:35 -05:00
Alex Dusenbery
7908565dd4 Update edx-enterprise to 3.17.4 | Include a docstring indicating a preference that we don't delete EnterpriseCourseEnrollments. 2021-01-12 15:59:04 -05:00
edx-abolger
8e54ef4360 Merge pull request #26044 from edx/edx-abolger/enterprise-3-17-3
Version bump edx-enterprise to 3.17.3
2021-01-12 14:01:10 -05:00
Bianca Severino
c903f7363d Merge pull request #26045 from edx/bseverino/proctoring-2.5.8
Update edx-proctoring to 2.5.8
2021-01-12 13:35:48 -05:00
Bianca Severino
78165fd33a Update edx-proctoring to 2.5.8 2021-01-12 13:06:23 -05:00
David Ormsbee
5f94a082ce Check sequence-level gating in render_xblock (TNL-7636).
There is certain gating logic around pre-reqs, timed exams, etc.
that happen at the SequenceModule level, and should be respected
when rendering descendant XBlocks (like individual problems) that
are in that Sequence. Rather than do a risky refactoring, I'm
keeping that logic where it is and having the render_xblock view
climb up through the ancestor list to call the SequenceModule for
that gating information.

We do _not_ check all descendants (so cousin leaf nodes in the
sequence) for cotent-type-based restrictions because sequences can
become very large (esp. when content libraries are used), and there
is a performance overhead.

If the enclosing sequence is gated in some way, we redirect to the
render_xblock view for that sequence, where hopefully some useful
messaging will be available. This is a stopgap. That redirect
should never happen because we should never be calling the leaf
XBlock for a sequence that is restricted in the MFE. But if somehow
we get there anyway, either by bug or by intrepid user fiddling,
it's better to redirect somewhere that an error _might_ be surfaced
rather than just failing.

This will actually be a little overzealous and lock things down
that should be made visible later. If there's a timed exam and the
exam is completed, it should be the case that content is visible
(just read-only). This commit will block the content before the exam
starts (this is right), open the content while the exam is live
(this is right), but make the content unavailable after the exam
period has finished (this is wrong).

But I am going to go forward with this even knowing it's wrong
because:

1. The render_xblock endpoint should never currently be used in
   timed exams in an intentional way. Neither the mobile experience
   nor the courseware MFE support it.
2. This fix will address security concerns for creative access
   patterns, even if it goes too far.
3. We're going to need to do a lot of work to address both pluggable
   access permissions handling and special exams in the courseware
   MFE, and a better implementation can be done then.
4. I've had multiple failed attempts to get this to work without
   breaking things on and off over the course of weeks, and this
   is a relatively low risk way of doing it that doesn't involve
   a major refactoring (though the bill for that will come due
   when we bring timed exams to the MFE).
2021-01-12 12:57:22 -05:00
Zainab Amir
2e6e360f03 fix login cookie parse issue (#26032) 2021-01-12 22:45:21 +05:00
Adrienne Bolger
81b8fada83 Version bump edx-enterprise to 3.17.3 2021-01-12 12:14:14 -05:00
David Ormsbee
5a149f0fe3 Enable timed/special exams and pre-reqs in devstack.
These are common and useful enough features that it makes sense to
enable it for developers by default.
2021-01-12 11:30:58 -05:00
Régis Behmo
d04d4291f5 Document non-namespaced waffle classes in ADR
It was finally decided not to use `skip_namespace_assertion` optional
arguments, but `NonNamespacedWaffle*` classes. We update the ADR to reflect
this change.
2021-01-12 16:58:11 +01:00
Régis Behmo
3a29cff016 Get rid of calls to set_request_cache_with_short_name
This method from the toggle legacy classes should not actually be
exposed to all. So we get rid of it by manually setting the cached
value. While we are at it, we convert the STORAGE_BACKING_FOR_CACHE
legacy waffle switch to its modern version. As the flag is not being
used elsewhere, this should not break anything.

We take the opportunity to modernize waffle switches from
block_structure.config: to do so we convert the INVALIDATE_CACHE_ON_PUBLISH and
RAISE_ERROR_WHEN_NOT_FOUND waffle switches from legacy classes to their modern
equivalents. These switches are not used outside of edx-platform, so this
change should not trigger any error.
2021-01-12 16:52:08 +01:00
Régis Behmo
71caa6a94d Upgrade edx-toggles to 2.0.0
2.0.0 introduces a backward-compatible WaffleFlag/Switch API. Existing toggles
that use the LegacyWaffle* classes should migrate to the new Waffle* classes.
2021-01-12 16:42:14 +01:00
Ahtisham Shahid
32985420c0 Added named logs (#26036)
Added named logs
2021-01-12 13:28:47 +05:00
Awais Qureshi
177c1a530f Merge pull request #26037 from edx/jenkins/upgrade-python-requirements-9be8a2b
Python Requirements Update
2021-01-12 12:02:52 +05:00
Awais Qureshi
4d3919fa81 Fixing package version. 2021-01-12 11:20:55 +05:00
edX requirements bot
07648422b5 Updating Python Requirements 2021-01-11 23:56:56 -05:00
Alex Dusenbery
9be8a2b562 Upgrade enterprise to 3.17.2 | stop listening for unenroll signal and deleting EnterpriseCourseEnrollments there-from. 2021-01-11 14:46:58 -05:00
Kellie Selinka
e858addce1 Merge pull request #26034 from edx/kselinka_enterprise_version_bump
version bump edx-enterprise
2021-01-11 13:44:26 -05:00
Kellie Selinka
8ef4f54d5d version bump edx-enterprise 2021-01-11 13:02:08 -05:00
Nizar
1e872d4e10 Adds support for enabling custom tinymce plugins in Studio's HTML editor (#25695) 2021-01-11 11:28:20 -05:00
Nizar
b49ebb93f8 Adds clean-js jake command to JakePackage and updates building instructions (#25324)
The clean-js jake command helps remove all minified js files that get generated using the minify bundle jake command

By running clean-js before running the minify command, we ensure that the tinymce files are consistent after being rebuilt/minified.

This is helpful with multiple app servers that are applying the same changes to the TinyMCE editor

This ensures that no matter on which machine the files are rebuilt, the resulting minified plugin files are consistent among all
2021-01-11 11:28:07 -05:00
Nathan Sprenkle
0e194bf517 Add team protection tests for CSV team management (#26019) 2021-01-11 10:42:50 -05:00
Christie Rice
7817c47df1 MICROBA-885 Check whitelisted, even if a grade exists (#26011) 2021-01-11 10:19:16 -05:00
Matthew Piatetsky
53ccf9bd84 Merge pull request #25988 from edx/AA-488
[AA-488] Remove uses of the active field on the schedule model in the code.
2021-01-11 09:34:00 -05:00
Ahtisham Shahid
33fb1e6b4a added logs in oauth exchange (#26005) 2021-01-11 19:05:28 +05:00
Michael Terry
1c322bbe67 Merge pull request #26008 from edx/mikix/timezone-alerts
Show discount deadline in a timezone-aware way
2021-01-11 08:00:43 -05:00
Usama Sadiq
eaecaec510 Merge pull request #26025 from edx/jenkins/upgrade-python-requirements-53dcec6
Python Requirements Update
2021-01-11 17:38:00 +05:00
usamasadiq
0d7fb1e2c9 Pin social-auth-core<4.0.2 2021-01-11 17:09:46 +05:00
Ali Akbar
e89127bfcc Merge pull request #26030 from edx/IM/security-fixes-4-thresholds
update thresholds after IM security fixes 4
2021-01-11 16:36:44 +05:00
edX requirements bot
5e0f34cb17 Updating Python Requirements 2021-01-11 16:00:34 +05:00
Awais Qureshi
6d8f356c01 Merge pull request #26015 from edx/awais786/drf-upgrade
Upgrade drf version.
2021-01-11 15:33:41 +05:00
Ali-D-Akbar
aa6da77c4e update thresholds after IM security fixes 4 2021-01-11 15:02:29 +05:00
SaadYousaf
c6a661820f [TNL-7820] - remove important rule for links on hover. 2021-01-11 14:35:53 +05:00