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

55306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
edX Transifex Bot
0fb92e1ad0 geoip2: update maxmind geolite country database 2020-07-29 17:01:51 -04:00
Jansen Kantor
2ea6b253d6 allow plus or minus one (#24637) 2020-07-29 16:03:41 -04:00
Adam Butterworth
a463fbeca9 Revert "[BD-10] [DEPR-92] Remove pattern library of pavelib folder (#24591)" (#24635) 
This reverts commit 6980291d96.
 2020-07-29 15:37:33 -04:00
Joseph Mulloy
42dd5a7f1a Merge pull request #24636 from edx/revert-24602-ama/DEPR-92-node-modules 
Revert "[BD-10] [DEPR-92] Remove directories that includes pattern library."
 2020-07-29 15:36:50 -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
Alex Wang
16a3d7fce3 Change the default value of allow_proctoring_opt_out (#24626) 
MST-333
 2020-07-29 07:51:21 -07:00
Aarif
e6684a761c Python Requirements Update (#24629) 2020-07-29 14:25:38 +05: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
edX requirements bot
1ca072e0a5 Updating Python Requirements 2020-07-29 04:09:25 -04: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
Aura Milena Alba
6980291d96 [BD-10] [DEPR-92] Remove pattern library of pavelib folder (#24591) 2020-07-28 10:21:05 -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
daphneli-chen
ed70584119 Merge pull request #24386 from edx/dlichen/AA-204 
Dlichen/AA-204
 2020-07-27 17:12:44 -04:00
Daphne Li-Chen
1d2dee8e25 AA-204: fixed up documentation and tests 2020-07-27 16:16:03 -04:00
Daphne Li-Chen
af1a7ca2d8 AA-204: adding tests 2020-07-27 16:15:53 -04:00
Daphne Li-Chen
6f8ecf3368 AA-204: passing correct section information to frontend to complete outline portion of tab 2020-07-27 16:15:53 -04:00
Diane Kaplan
725e0bbd2c [REV-1205] Add doc location comment so future devs can easily find it (#24615) 2020-07-27 14:55:16 -04:00
stvn
06e04eff8c Bucket users regardless of enrollment in courseware MFE experiment 2020-07-27 11:46:26 -07:00
Calen Pennington
005fc1f1cf Merge pull request #24588 from cpennington/experiment-flag-masquerade 
Make the ExperimentWaffleFlag respect course masquerading when checki…
 2020-07-27 14:32:51 -04:00
Calen Pennington
bb12560233 Make the ExperimentWaffleFlag respect course masquerading when checking if it's active for a specific enrollment 2020-07-27 13:59:53 -04:00
Sankar Raj
d00633e942 [BD-10] remove edx-pattern-library from JS bundles (#24165) 
Co-authored-by: Sankar Raj <sankar.raj@crystaldelta.com>
 2020-07-27 12:19:15 -04:00
morenol
68d1c7f78c [BD-10] Remove _uses_pattern_library property from EdxFragmentViews (#24536) 2020-07-27 12:01:40 -04:00
Zachary Hancock
4e0029891f allow blank escalation email (#24613) 2020-07-27 11:59:51 -04:00
Zachary Hancock
57de9b2ac6 POST proctored exam settings (#24597) 2020-07-27 09:23:03 -04:00
JJ
b77d4c9490 [REV-1257] Add upsell tracking for upgrading all programs button on program dashboard (#24589) 
Added upsell tracking to the course upgrade all button on the program dashboard so we have a better understanding of when users are clicking our upsell links.
 2020-07-27 09:21:46 -04:00
M. Zulqarnain
684230463a Merge pull request #24612 from edx/jenkins/upgrade-python-requirements-0c51f37 
Python Requirements Update
 2020-07-27 13:50:55 +05:00
edX requirements bot
210ae4378e Updating Python Requirements 2020-07-27 04:05:55 -04:00
edX Transifex Bot
0c51f37318 fix(i18n): update translations 2020-07-26 17:46:29 -04:00
Jeff Chaves
e1bd970b46 ENT-2894: Use new welcome template when redirected from enterprise proxy login view (#24587) 
* using new welcome template when redirected from enterprise proxy login view

* enabling safe redirects to enterprise learner portal from login in devstack

* ading admin portal to login redirect whitelist

* running make upgrade to version bump edx-enterprise
 2020-07-24 17:40:42 -04:00