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

55293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Simon Chen
38d1df33e2 MST-334 Make sure the CSRF hooks are in INSTALLED_APPS on Studio (#24607) 2020-07-24 17:04:46 -04:00
Michael Roytman
56fbf3d758 Merge pull request #24603 from edx/mroytman/add-csrf-urls-to-Studio 
Add edX Django Rest Framework Extensions CSRF App URLS to Studio
 2020-07-24 15:53:08 -04:00
taliaedX
b6a7874702 Merge pull request #24557 from edx/trhodes/saml_api_updates 
BUG: fixes for front end work and to align with data requirements.
 2020-07-24 15:12:17 -04:00
Albert St. Aubin
4db9a6aa8d [MICROBA-485] Added support API and model for hiding the demographics CTA 
The Demographics CTA is used to ask users to respond to the optional
questions. This API and model support the API being dismissed by the
user so they are not bothered by it.
 2020-07-24 15:08:28 -04:00
Michael Roytman
c1ddfe29a3 Add edX Django Rest Framework Extensions CSRF App URLS to Studio 2020-07-24 14:50:16 -04:00
Talia
6d365ca1da fixes for front end saml work and to align with data requirements. 2020-07-24 14:45:34 -04:00
Aarif
2ab5eb5dad Bokchoy Testing DB Cache update (#24599) 2020-07-24 22:06:32 +05:00
JJ
1f3965be29 [REV-1257] Add upsell tracking for program dashboard's courses 
This PR updates the track_ecommerce_events.js to allow imports into webpacked code & 
adds upsell tracking to the course upgrade buttons on the program dashboard. We are doing this so we have a better understanding of when users are clicking our upsell links.
 2020-07-24 12:38:41 -04:00
stvn
862e1a37d4 Merge PR #24577 fix/error/zendesk-proxy 
* Commits:
  Handle zendesk_proxy AttributeError
 2020-07-24 09:22:51 -07:00
edX cache uploader bot
3599a2ade2 Updating Bokchoy testing database cache 2020-07-24 11:35:10 -04:00