Commit Graph

55413 Commits

Author SHA1 Message Date
SaadYousaf
5f9d41b124 PROD-1290 2020-08-11 17:48:57 +05:00
edX requirements bot
9d83ca2eb9 Updating Python Requirements (#24744) 2020-08-11 11:26:39 +05: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
07f96f2bba Merge pull request #24731 from edx/mikix/small-pls-fixes
Small PLS courseware banner fixes
2020-08-10 10:30:07 -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
Jansen Kantor
7d7c47c82b ora version (#24734) 2020-08-10 09:39:31 -04:00
M. Zulqarnain
14b1533557 Merge pull request #24736 from edx/jenkins/upgrade-python-requirements-0dbfcbb
Python Requirements Update
2020-08-10 14:08:20 +05:00
edX requirements bot
fbfa776a35 Updating Python Requirements 2020-08-10 00:55:18 -04:00
edX Transifex Bot
0dbfcbbf3b fix(i18n): update translations 2020-08-09 17:38:49 -04:00
Ben Warzeski
21aced2c09 bump ora to 2.8.13 (#24732) 2020-08-07 16:59: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
Tim McCormack
b04f784d7a Unpin django-pytest now that pytest has upgraded to 5.4.0 and later (#24730)
- Originally pinned in PR #23566
- pytest was unpinned in PR #24717 and upgraded to v6+
2020-08-07 17:40:22 +00:00
Nathan Sprenkle
ccefeba004 Bump ORA to 2.8.12 (#24729) 2020-08-07 13:06:14 -04:00
Michael Terry
5ce6ac9c3e Merge pull request #24728 from edx/mikix/warn-on-is-past-due-prop
Warn if an xblock defines is_past_due as a property
2020-08-07 11:33:29 -04:00
Michael Terry
e0a0d4d6e3 Warn if an xblock defines is_past_due as a property
We support it still, but want to encourage folks to try to define it
as a method, so that in the future, we can rely on it being one.

Also updates lti-consumer to a version that has the value as a
method.
2020-08-07 10:29:10 -04:00
M. Zulqarnain
e575a12ef6 Merge pull request #24726 from edx/testeng/bokchoy_auto_cache_update_a08ab65fb2ff817af6902123a1310faea4933405
Bokchoy Testing DB Cache update
2020-08-07 19:23:34 +05: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
Tim McCormack
514bd4a105 Unpin pytest and allow upgrade past 5.4.0 all the way to 6.0.1 (#24717)
This was pinned in PR #23533 for intermittent breakage in pytest
reporting (https://github.com/pytest-dev/pytest/issues/6925) but
that seems to have since been fixed.
2020-08-07 13:44:37 +00:00
edX cache uploader bot
b09e90cf7a Updating Bokchoy testing database cache 2020-08-07 09:36:17 -04:00
Syed Muhammad Dawoud Sheraz Ali
c554f0ce9d Merge pull request #24724 from edx/dsheraz/PROD-1886-Part-2
drop percentage column from VemPipelineIntegration model
2020-08-07 18:25:38 +05:00
Adolfo R. Brandes
455dd9db4c New library authoring MFE toggle 2020-08-07 09:22:01 -04:00
Adolfo R. Brandes
dff0e2a564 Clean up CORS-related settings 2020-08-07 09:22:01 -04:00
M. Zulqarnain
c835a2a291 Merge pull request #24722 from edx/jenkins/upgrade-python-requirements-8c93a14
Python Requirements Update
2020-08-07 13:37:15 +05:00
DawoudSheraz
1947f2105b drop precentage column from VemPipelineIntegration model 2020-08-07 13:09:48 +05:00
Syed Muhammad Dawoud Sheraz Ali
2a7553c1a7 Merge pull request #24674 from edx/dsheraz/PROD-1886-Part-1
remove percentage field from VEM pipeline config model
2020-08-07 11:25:19 +05:00
DawoudSheraz
dae599b517 skip db test 2020-08-07 10:27:50 +05:00
DawoudSheraz
12f2e6eb2b remove percentage field from VEM pipeline config model 2020-08-07 10:25:52 +05:00
edX requirements bot
b63286d9e3 Updating Python Requirements 2020-08-07 00:55:39 -04:00
Michael Terry
8c93a144c0 Merge pull request #24719 from edx/mikix/is-past-due
Fix possible reference to is_past_due property
2020-08-06 17:19:26 -04: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
Michael Terry
023ae07753 Fix possible reference to is_past_due property 2020-08-06 16:54:45 -04:00
Dave St.Germain
b0e45174c9 Merge pull request #24711 from edx/dcs/upgrade-xblock
Upgrade XBlock
2020-08-06 16:41:16 -04: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
Dave St.Germain
f259c91efb This upgrades XBlock, which now contains a default index_dictionary method. 2020-08-06 15:56:48 -04: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
Syed Muhammad Dawoud Sheraz Ali
6802b74133 Merge pull request #24709 from edx/dsheraz/constraint-xblock-version
lock xblock version to 1.3.1
2020-08-06 19:46:56 +05:00
DawoudSheraz
7fdf2b28c5 lock xblock version to 1.3.1 2020-08-06 19:04:26 +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
Syed Muhammad Dawoud Sheraz Ali
fa7945aeac update staff-graded-xblock (#24705)
* update staff-graded-xblock
2020-08-06 18:55:49 +05: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