Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ahmad Bilal Khalid
30274b00e3 fixed nit 2020-08-07 01:03:42 +05:00
Dave St.Germain
f259c91efb This upgrades XBlock, which now contains a default index_dictionary method. 2020-08-06 15:56:48 -04:00
Ahmad Bilal Khalid
971bb1bebd fixed issues pointed by kshitij 2020-08-07 00:26:07 +05: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
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
edX Transifex Bot
062eb3e82c geoip2: update maxmind geolite country database 2020-08-05 17:17:02 -04: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
Dave St.Germain
9fbd735b80 Merge pull request #24534 from open-craft/ahmed/bb-2706-make-wordcloud-indexable 
[BD-29] [TNL-6993]: Make Word Cloud indexable
 2020-08-05 14:20:08 -04:00
Nick
f5fc07c98b Merge pull request #24689 from edx/ndalfonso/AA-283-mobile-reset-dates-endpoint 
AA-283 mobile reset dates endpoint
 2020-08-05 14:08:19 -04:00
Ahmad Bilal Khalid
7a03d064ba Make WordCloud indexable 2020-08-05 22:42:18 +05: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
754f231f68 AA-283 mobile reset dates endpoint 
- add has_ended to endpoint
 2020-08-05 11:53:59 -04:00
Michael Roytman
2e4bfecc6c Merge pull request #24663 from edx/mroytman/MST-345-proctoring-escalation-email-empty 
mroytman/mst 345 proctoring escalation email empty
 2020-08-05 11:33:25 -04: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
b475d7caed Merge pull request #24558 from edx/feanil/depr-43-remove-donation-button 
DEPR-43 - Remove donation logic from student dashboard.
 2020-08-05 10:43:26 -04:00
Ahmad Bilal Khalid
3fab3ad47f issue fixed, use regex to replace 2020-08-05 16:26:12 +05:00
Awais Qureshi
8ac60d9063 Merge pull request #24687 from edx/testeng/bokchoy_auto_cache_update_e45fe411d688df98432718e8ebf3b7ad4022d712 
Bokchoy Testing DB Cache update
 2020-08-05 12:59:47 +05:00
Aarif
b6e4ecf161 Python Requirements Update (#24691) 2020-08-05 11:20:59 +05:00
edX requirements bot
e73066dfbb Updating Python Requirements 2020-08-05 00:55:00 -04:00
edX cache uploader bot
e3a5d2a82e Updating Bokchoy testing database cache 2020-08-04 16:01:06 -04:00
Alex Dusenbery
a29ef57da6 ENT-2892 | Migration to remove deprecated branding config fields. edx-enterprise 3.4.38 2020-08-04 15:55:49 -04:00
Feanil Patel
aefd7abd5e Merge branch 'master' into feanil/depr-43-remove-donation-button 2020-08-04 15:09:13 -04:00
Dillon Dumesnil
c0c1279bdb Merge pull request #24684 from edx/ddumesnil/fix-enabled-show-answer 
Fix for enabled_for to not assume the self_paced attr exists
 2020-08-04 11:43:55 -07:00
Alex Dusenbery
c69fb5b274 ENT-2892 | Bump edx-enterprise to 3.4.36. This version removes some model field references, but does not create a migration, to the test to check that migrations are in sync has been skipped here. 2020-08-04 14:24:56 -04:00
Dillon Dumesnil
f5c893e34d Fix for enabled_for to not assume the self_paced attr exists 
Also being defensive on category just in case
 2020-08-04 11:20:59 -07:00
Aarif
b00804fa4c remove cyclomatic code complexity calculation (#24662) 2020-08-04 23:02:21 +05: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
Michael Roytman
5b4527097b change proctoring_escalation_email serializer to not be required and to allow null to better align with the underlying data model and use case 2020-08-04 13:16:44 -04:00
daphneli-chen
34cd0ab4c4 Merge pull request #24650 from edx/dlichen/AA-211 
Dlichen/AA-211
 2020-08-04 13:11:43 -04:00
Ahmad Bilal Khalid
eb89988944 fixed issue 2020-08-04 22:11:16 +05:00
Aarif
09ac7f9372 remove cyclomatic complexity calculation for python code 2020-08-04 22:10:05 +05:00