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

55345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
daphneli-chen
34cd0ab4c4 Merge pull request #24650 from edx/dlichen/AA-211 
Dlichen/AA-211
 2020-08-04 13:11:43 -04:00
Aarif
09ac7f9372 remove cyclomatic complexity calculation for python code 2020-08-04 22:10:05 +05: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
c40b53e0e7 Merge pull request #24670 from edx/mikix/outline-offer-html 
AA-278: Add offer html to the course-home API
 2020-08-04 10:34:58 -04: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
Alex Dusenbery
3d1148b874 ENT-2982 | Upgrade edx-enterprise to 3.4.34 2020-08-04 09:21:01 -04:00
Usama Sadiq
a04dfce50c Merge pull request #24668 from edx/testeng/bokchoy_auto_cache_update_75c92249185a4af4668e78d7c894e6e445f9696b 
Bokchoy Testing DB Cache update
 2020-08-04 17:27:57 +05:00
M. Zulqarnain
bcb31dc864 Merge pull request #24673 from edx/jenkins/upgrade-python-requirements-f37161c 
Python Requirements Update
 2020-08-04 14:51:25 +05:00
bom
f4059ca600 pinned pymongo version to 3.10.1 2020-08-04 12:37:36 +05:00
edX requirements bot
5ab6f2100b Updating Python Requirements 2020-08-04 00:55:43 -04:00
alangsto
f37161c4ee prevent changes to settings via POST (#24665) 
prevent changes to settings via POST

prevent changes to settings via POST

updated test name

updated based on feedback

removed comments
 2020-08-03 16:56:30 -04:00
edX cache uploader bot
d93bd08ae9 Updating Bokchoy testing database cache 2020-08-03 15:43:10 -04:00
Alex Dusenbery
f9a5b7790b Upgrade edx-enterprise to 3.4.33 2020-08-03 15:38:31 -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
David Ormsbee
d1f23422ca Merge pull request #24417 from open-craft/ahmed/bb-2675-support-annonymous-outline-access 
[BD-29] [TNL-7263] Support Anonymous Courseware Access
 2020-07-30 16:22:02 -04:00
Aarif
fabaf32bec Bokchoy Testing DB Cache update (#24649) 2020-07-31 00:11:28 +05:00
edX cache uploader bot
8e8a507520 Updating Bokchoy testing database cache 2020-07-30 13:34:03 -04:00
Alex Dusenbery
487fde77de Upgrade edx-enterprise to 3.4.31 2020-07-30 13:24:36 -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
taliaedX
853a54ea4c Merge pull request #24630 from edx/trhodes/saml_queryset_fix 
BUG: fixes for saml provider config/data lookup
 2020-07-30 10:51:12 -04:00
Jeff LaJoie
a2d2646ee5 Merge pull request #24634 from edx/jlajoie/enterprise-header-caching-fix 
Fixes session caching for enterprise portal links by only caching for auth'd learners
 2020-07-30 10:33:40 -04:00
Carla Duarte
047414d776 Merge pull request #24582 from edx/ciduarte/AA-127 
AA-127: Created MFE Outline Tab Waffle Flag
 2020-07-30 10:17:20 -04:00
Talia
2b956c54a0 BUG: fixes for saml provider config/data lookup 2020-07-30 10:05:19 -04:00
Jeff LaJoie
4282530faf Fixes session caching for enterprise portal links by only caching for auth'd learners 2020-07-30 09:18:35 -04:00
Ahmad Bilal Khalid
53fe1dd7bc Adds Enrollment Processor which is responsible for respecting course's outline access. 
Moved data.py out into the parent's dirctory i.e learning_sequences directory to avoid circular import issue which is occuring when we try to import data.py from models.py.

A new CourseContext model is created, which is responsible for housing course specific fields e.g course_visibility.
 2020-07-30 12:44:19 +05:00
Uzair Rasheed
4cf3c00021 Merge pull request #184 from edx/security-fix/fix-xss-tos 
Fix XSS while prepending html
 2020-07-30 11:00:05 +05:00
Uzair Rasheed
bad3b29b6c Merge pull request #189 from edx/security-fix/fix-xss-basesite 
Fix xss in base site template
 2020-07-30 10:59:53 +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
Adam Stankiewicz
00f4ea3fc3 fix keyerror with request.session (#24642) 
* fix keyerror with request.session

* improve the conditional
 2020-07-29 20:44:43 -04: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