Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,377 Commits 1 Branch 0 Tags
f259c91efb397dc9509956b8652c0ff8aed51a55
Commit Graph

21533 Commits

Author SHA1 Message Date
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
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
Michael Terry
bfb5884f79 Merge pull request #24620 from edx/mikix/enroll-alert 
AA-124: Give Learning MFE enroll alert information
 2020-07-30 12:48:15 -04:00
Zachary Trabookis
7da15d108e Set SESSION_COOKIE_SAMESITE=Lax for devstack_docker environment by default to allow login to LMS service. This is a fix for devstack_docker default value set to Lax for DCS_SESSION_COOKIE_SAMESITE. It was defaulting to SameSite=None which requires a secure site which localhost site does not by default. Setting this SameSite cookie attribute to something other than None will continue to allow login to the LMS for devstack_docker environment. Regards to #23671 and https://discuss.openedx.org/t/lti-xblock-and-samesite/759/16 
Set `SESSION_COOKIE_SAMESITE=Lax` for `devstack_docker` environment by default to allow login to LMS service.  This is a fix for `devstack_docker` default value set to `Lax` for `DCS_SESSION_COOKIE_SAMESITE`. It was defaulting to `SameSite=None` which requires a secure site which `localhost` site does not by default.  Setting this `SameSite` cookie attribute to something other than `None` will continue to allow login to the LMS for `devstack_docker` environment.  Regards to #23671 and https://discuss.openedx.org/t/lti-xblock-and-samesite/759/16
 2020-07-30 12:29:43 -04:00
edx-pipeline-bot
8cfb6e6256 Merge pull request #24646 from edx/private_to_public_4cf3c00 
Mergeback PR from private to public.
 2020-07-30 20:15:02 +05:00
Uzair Rasheed
314fae8928 Merge pull request #190 from edx/security-fix/fix-xss-date 
Fix xss in date
 2020-07-30 10:59:44 +05:00
Uzair Rasheed
6b0be2cb6b Merge pull request #191 from edx/security-fix/fix-xss-in-file-upload 
Fix xss while rendering file-upload
 2020-07-30 10:59:35 +05:00
Uzair Rasheed
32fae72852 Merge pull request #192 from edx/security-fix/fix-xss-edit-member 
Fix xss in edit member template
 2020-07-30 10:59:21 +05:00
Carla Duarte
b50fb39fc8 AA-127: Created MFE Outline Tab Waffle Flag 
Note: The team settled on raising a 404 when the waffle flag is disabled.
Upon receiving the 404, the frontend will redirect to the LMS.
 2020-07-29 18:57:58 -04:00
Jansen Kantor
2ea6b253d6 allow plus or minus one (#24637) 2020-07-29 16:03:41 -04:00
Adam Butterworth
0e0c9887b1 Revert "[BD-10] [DEPR-92] Remove directories that includes pattern-library. (#24602)" 
This reverts commit e4f28debb7.
 2020-07-29 14:56:49 -04:00
Adam Butterworth
ca7f488796 Revert "[BD-10] [DEPR-92] Remove pattern library of certificate styles." (#24633) 2020-07-29 13:57:46 -04:00
David Ormsbee
7561fe751c Merge pull request #24385 from open-craft/mavidser/source-from-library-xblock 
[BD-14]"Source from Library" XBlock
 2020-07-29 12:14:48 -04:00
Jeff Chaves
87f444fd44 ENT-3143: display message banner guiding user to their enterprise LP if enabled (#24625) 
* display message banner guiding user to their enterprise LP if enabled

* adding new sass class name to use same styling as recovery email alert
 2020-07-29 11:55:02 -04:00
stvn
dce22f461f Merge PR #24617 feat/lmfe/unbucket-enrollment 
* Commits:
  Bucket users regardless of enrollment in courseware MFE experiment
 2020-07-29 02:07:33 -07:00
Bianca Severino
9deb6e1b0f Merge pull request #24614 from edx/bseverino/support-sso-endpoint 
Add SSO Records endpoint for support tools
 2020-07-28 14:08:35 -04:00
Bianca Severino
136db5ec28 Add SSO Records endpoint for support tools 2020-07-28 13:39:49 -04:00
Aura Milena Alba
e4f28debb7 [BD-10] [DEPR-92] Remove directories that includes pattern-library. (#24602) 2020-07-28 10:21:30 -04:00
Diane Kaplan
c2cdedbd1f make comment more general, to allow for future changes (#24618) 2020-07-28 09:34:43 -04:00
Ben Warzeski
beace438a4 update search description on new search string (#24619) 
* update search description on new search string

* disable xss-lint rule for jquery.html
 2020-07-28 09:21:59 -04:00
Adam Butterworth
1ca9b70c85 Remove pattern library of certificate styles. (#24570) 2020-07-28 08:58:19 -04:00
morenol
5949c17dda [BD-10] Remove uses bootstrap method (#24535) 2020-07-28 08:57:42 -04:00
Daphne Li-Chen
1d2dee8e25 AA-204: fixed up documentation and tests 2020-07-27 16:16:03 -04:00