Commit Graph

21554 Commits

Author SHA1 Message Date
Nick
10ac2780de Merge pull request #24733 from edx/ndalfonso/AA-287-cta-events
AA-287 cta events
2020-08-12 09:37:13 -04:00
Manjinder Singh
c76ed6ae45 Extracting plugin app from edx-platform (#24678)
* Moving plugins infrastructure to edx-django-utils
This PR extracts the code that enables plugins in edx-platform and puts it in edx-django-utils. This is done to allow other IDAS to add plugin functionality.
2020-08-12 07:48:53 -04:00
Zia Fazal
601dc79ded Merge pull request #24743 from edx/ziafazal/e2e-tests-devstack
[BD-18] Disable django debug toolbar when running e2e tests
2020-08-12 09:51:47 +05:00
Guruprasad Lakshmi Narayanan
149ebfec58 Fix the order randomization behaviour of Randomized Content Block
The Randomized Content Block XBlock only randomizes the selection of
the children blocks and has unpredictable randomization of
the order of the selected child blocks due to the usage of sets, which
are unordered, for storing the selected blocks. This becomes apparent
when all the available child blocks in a library are chosen for a
Randomized Content Block, to randomize just the order of the child
blocks and not just the selection of the blocks. The order of the
selected blocks ends up being similar for multiple learners.

This change modifies the XBlock to store the selected child blocks in
a list, instead of a set, after randomly shuffling them.

A new block structure transformer, ContentLibraryOrderTransformer has
been added to transform the order of the selected children XBlocks to
match the order of the selections made in the
ContentLibraryTransformer. This ensures that same correct randomized order
of blocks is also returned by the course blocks API.
2020-08-11 11:46:49 -04:00
Carla Duarte
6ab1a16123 Merge pull request #24643 from edx/ciduarte/AA-129
AA-129: Resume Course data for Course Home MFE
2020-08-11 11:02:17 -04:00
Andytr1
001cf153b3 EDUCATOR-5181 grading documentation (#24727) 2020-08-11 10:00:00 -04:00
Aura Milena Alba
39900f052c [BD-10] Remove uses of variable uses_pattern_library (#24628) 2020-08-11 09:57:12 -04:00
Nicholas D'Alfonso
0211a2b0ff AA-287 cta events 2020-08-10 18:00:13 -04:00
Carla Duarte
4bbb7fadbd Resume Course data for Course Home MFE 2020-08-10 16:32:24 -04:00
Kyle McCormick
61f8df5453 Clarify course_key/use_course_aware_bucketing nuances in docstrings 2020-08-10 11:57:02 -04:00
Kyle McCormick
662388c7db Allow omission of course_key in call to CourseWaffleFlag.is_enabled
This effectively evaluates the flag outside of the context of a course.
This was previously available through `.is_enabled_without_course_context`,
which has been removed in favor of simply `is_enabled()`.

This was done to make the CourseWaffleFlag interface more uniform with
that of WaffleFlag and ExperimentWaffleFlag and eliminate unecessary
branching when handling CourseWaffleFlags.
2020-08-10 11:57:02 -04:00
Kyle McCormick
b05948153a Add course-unawareness option to ExperimentWaffleFlag
For the Courseware MFE rollout experiment, we want users'
default buckets to be consistent across course runs.

ExperimentWaffleFlag advised that this could be done
by calling `.is_enabled(...)` without a course_key argument;
however, doing so breaks when uing the main_flag.BUCKET_NUM
scheme to apply bucket rules for a specific set of users
or courses.

This commit explicitly adds course-unaware-bucketing via
a new kwarg to ExperimentWaffleFlag.__init__ method.

Furthermore, it fixes ExperimentWaffleFlag.is_enabled(course_key=None)
to work as advertised, by means of calling
.is_enabled_without_course_context on its subordinate flags.

TNL-7405
2020-08-10 11:57:02 -04:00
Michael Terry
c2033f9667 Small PLS courseware banner fixes
- Hide the submit-button CTA link to reset dates in the mobile
  app. They are working on their own solution.
- Don't show the dates_banner.html code in the courseware. It has
  new CTA banner support with updated wording.
2020-08-10 09:44:43 -04:00
edX Transifex Bot
0dbfcbbf3b fix(i18n): update translations 2020-08-09 17:38:49 -04:00
Jansen Kantor
eed9ec8824 EDUCATOR-5031: Delete 'Student State' for all team members (Part 2): Delete team member student module (#24187)
reset student module for teams
2020-08-07 13:59:13 -04:00
Alex Dusenbery
956bb1f1b4 Enterprise users for which the learner portal is enabled should not see 'Order History' in their user menu, since it is not relevant to their method of purchasing content. 2020-08-07 10:04:32 -04:00
Adolfo R. Brandes
dff0e2a564 Clean up CORS-related settings 2020-08-07 09:22:01 -04:00
zia.fazal@arbisoft.com
03d788e1c3 Changes to run e2e test on devstack 2020-08-07 09:55:47 +05:00
stvn
652f07a31c Merge PR #24703 add/masquerade/as-specific-student-enable
* Commits:
  Enable backend config for specific-student masquerading
2020-08-06 13:58:23 -07:00
Tim McCormack
b64c8c2283 ARCHBOM-1281: Vendor in AppleID backend to support Sign-In With Apple (#24623)
This version contains necessary fixes for validating the "audience"
component of the JWT, as seen in ARCHBOM-1281. (I believe we'll need to
pass both the App ID and the Service ID in an additional AUDIENCE "other
settings" key for this third-party-auth backend.)

Vendored from version 3.4.0 (9d93069564a60495e0ebd697b33e16fcff14195b)
social-core:
https://github.com/python-social-auth/social-core/blob/3.4.0/social_core/backends/apple.py

v3.4.0 is unreleased at this time (2020-07-28) and contains several
necessary bugfixes over 3.3.3 for AppleID, but also causes the
TestShibIntegrationTest.test_full_pipeline_succeeds_for_unlinking_testshib_account
test in common/djangoapps/third_party_auth/tests/specs/test_testshib.py
to break (somehow related to social-core's change 561642bf which makes
a bugfix to partial pipeline cleaning). ARCHBOM-1389 filed to address
this at our convenience.

Note: 3.4.0 was not released to PyPI due to a broken test, so we might
see a 3.4.1 when it's actually released:
https://github.com/python-social-auth/social-core/issues/485
2020-08-06 20:11:23 +00:00
David Ormsbee
c0339a0b78 Merge pull request #24586 from open-craft/nizar/add_other_course_settings_to_course_blocks_api
Adds Custom Extra Fields  to Course Blocks API through LMS Settings
2020-08-06 15:09:39 -04:00
Calen Pennington
f9619d6cad Add a pluggable CallToAction service for XBlocks
This also has an initial use case for Personalized Learner Schedules
to add CTAs to capa and vertical blocks to allow users to shift their
course deadlines.
2020-08-06 14:38:26 -04:00
Nizar Mahmoud
c0b6260c3e Adds Custom Extra Fields to Course Blocks API through LMS Settings 2020-08-06 21:27:31 +03:00
edx-pipeline-bot
30750d6c52 Merge pull request #24713 from edx/private_to_public_fa71eec
Mergeback PR from private to public.
2020-08-06 22:14:31 +05:00
Binod Pant
b14772055c Canvas integrated_channel from enterpise v3.4.40 (#24699) 2020-08-06 12:25:44 -04:00
stvn
26e2b35bc4 Merge PR #24455 add/masquerade/as-specific-student
* Commits:
  Add active group name to masquerade endpoint
  Fix masquerade message
  Normalize masquerade response data
2020-08-06 09:15:58 -07:00
adeelehsan
fa71eecc77 Merge pull request #193 from edx/aehsan/fixed_xss_linter_violations
Fixed xss linter violations
2020-08-06 20:31:33 +05:00
Nick
f3b1238ab3 Merge pull request #24708 from edx/ndalfonso/styling-for-courseware-dates-banner
Add styling for courseware dates banner button
2020-08-06 10:02:17 -04:00
Dillon Dumesnil
2d7c6b2730 Merge pull request #24693 from edx/ddumesnil/persist-masquerade-staff-aa-275
AA-275: Persist Masquerade User staff status
2020-08-06 06:53:53 -07:00
Michael Terry
2fe4d34a4b Merge pull request #24682 from edx/mikix/course-expired-html
AA-279: Add course-expired html to the course-home outline API
2020-08-06 09:48:37 -04:00
Nicholas D'Alfonso
6215caadc7 Add styling for courseware dates banner button 2020-08-06 09:26:49 -04:00
stvn
8758c32a9e Enable backend config for specific-student masquerading 2020-08-05 19:17:29 -07:00
stvn
d4f1c271aa Add active group name to masquerade endpoint 2020-08-05 19:15:12 -07:00
stvn
3fce917fce Fix masquerade message
by removing the "escaped" username. I'm not sure why we this is done
this way (it's displayed the same way in the existing experience.
2020-08-05 19:14:56 -07:00
stvn
ab8bcccd01 Normalize masquerade response data
so that it's easier to work with on the frontend.
2020-08-05 19:14:56 -07:00
Kyle McCormick
7e51232205 Revert "Bucket users regardless of enrollment in courseware MFE experiment" (#24700)
This reverts commit 06e04eff8c.

Omitting the course_key argument to ExperimentWaffleFlag.is_enabled
causes a 500 when the underlying experiment flag is enabled.

TNL-7405
2020-08-05 16:28:34 -04:00
Nick
f621c45f24 Merge pull request #24671 from edx/ndalfonso/AA-264-mfe-courseware-reset-dates
AA-264 mfe courseware reset dates
2020-08-05 14:23:10 -04:00
Adam Butterworth
fc0694397e Reapply [BD-10] [DEPR-92] Remove pattern library of certificate styles. (#24694)
* Revert "Revert "[BD-10] [DEPR-92] Remove pattern library of certificate styles." (#24633)"

This reverts commit ca7f488796.

* Add missing slash in font path
2020-08-05 11:41:59 -05:00
Nicholas D'Alfonso
db5214b216 AA-264 mfe courseware reset dates 2020-08-05 11:25:09 -04:00
Dillon Dumesnil
c66bc865b6 AA-275: Persist Masquerade User staff status
We need both the original user's staff status as well as
the staff status of the user being masqueraded as.
2020-08-05 08:03:55 -07:00
Feanil Patel
aefd7abd5e Merge branch 'master' into feanil/depr-43-remove-donation-button 2020-08-04 15:09:13 -04:00
Michael Terry
bffa3f9f24 AA-279: Add course-expired html to the course-home outline API
This will let the learning MFE render it on the outline tab (like
it already does on the courseware tab).
2020-08-04 13:45:25 -04:00
Daphne Li-Chen
2b4926eb54 AA-211: sending certificate information and studio link for displaying on fe 2020-08-04 11:44:03 -04:00
Dillon Dumesnil
73dcd9f2a3 Merge pull request #24627 from edx/ddumesnil/show-answer-pls
AA-261: Overridding Show Answer functionality for PLS courses
2020-08-04 08:40:06 -07:00
Dillon Dumesnil
75f6937003 AA-261: Overridding Show Answer functionality for PLS courses
We noticed that since users can choose to reset their due dates,
they would have the ability to let due dates pass and then for any
assessment that allows viewing the answer after the due date would be
visible. The user could thus view all answers and then reset their
due dates to receive a perfect score.

This PR works to fix that issue by changing all show answer values
to not take into account being past the due date when inside a PLS
course.
2020-08-04 07:44:59 -07:00
Michael Terry
da4dc6c848 AA-278: Add offer html to the course-home API
This is for the frontend-app-learning MFE to consume and show an
alert when offer_html is defined.

I've also tweaked that html a bit to work better in an environment
that doesn't have LMS's exact css.
2020-08-04 09:38:58 -04:00
Dillon Dumesnil
3c375f0f8e Merge pull request #24657 from edx/ddumesnil/assignment-type-prefix-aa-280
AA-280: Add assignment type to date blocks serialization
2020-07-31 12:05:17 -07:00
Dillon Dumesnil
7dda524aaf AA-280: Add assignment type to date blocks serialization 2020-07-31 10:56:38 -07:00
Adam Stankiewicz
31f68d86ce fix msg banner spacing and padding (#24656) 2020-07-31 10:04:09 -04:00
Feanil Patel
d90c935ca9 Merge pull request #24593 from CUCWD/ztraboo.master/samesite-cookie-session-default
Fix issue with `SameSite=None` cookies from being blocked when `django_cookies_samesite.middleware.CookiesSameSite` is enabled for `devstack_docker` environment.
2020-07-30 13:14:47 -04:00