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

9053 Commits

Author SHA1 Message Date
edx-pipeline-bot
a64970de74 Merge pull request #24760 from edx/private_to_public_8df43bd 
Mergeback PR from private to public.
 2020-08-12 17:38:12 +05:00
Manjinder Singh
c76ed6ae45 Extracting plugin app from edx-platform (#24678) 
* Moving plugins infrastructure to edx-django-utils
This PR extracts the code that enables plugins in edx-platform and puts it in edx-django-utils. This is done to allow other IDAS to add plugin functionality.
 2020-08-12 07:48:53 -04:00
Ali Akbar
8df43bd201 Merge pull request #194 from edx/aakbar/PROD-1534 
PROD-1534 security fixes
 2020-08-12 12:30:25 +05:00
Ali Akbar
fb94f09bea Merge pull request #186 from edx/sustaining/security-fixes-2 
Sustaining/security fixes 2
 2020-08-12 12:30:14 +05:00
Zia Fazal
601dc79ded Merge pull request #24743 from edx/ziafazal/e2e-tests-devstack 
[BD-18] Disable django debug toolbar when running e2e tests
 2020-08-12 09:51:47 +05:00
Aura Milena Alba
39900f052c [BD-10] Remove uses of variable uses_pattern_library (#24628) 2020-08-11 09:57:12 -04:00
edX Transifex Bot
0dbfcbbf3b fix(i18n): update translations 2020-08-09 17:38:49 -04:00
Adolfo R. Brandes
455dd9db4c New library authoring MFE toggle 2020-08-07 09:22:01 -04:00
Adolfo R. Brandes
dff0e2a564 Clean up CORS-related settings 2020-08-07 09:22:01 -04:00
DawoudSheraz
12f2e6eb2b remove percentage field from VEM pipeline config model 2020-08-07 10:25:52 +05:00
zia.fazal@arbisoft.com
03d788e1c3 Changes to run e2e test on devstack 2020-08-07 09:55:47 +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
Binod Pant
b14772055c Canvas integrated_channel from enterpise v3.4.40 (#24699) 2020-08-06 12:25:44 -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
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
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
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
Ali-D-Akbar
0c67645d7f PROD-1534 2020-07-30 02:12:40 +05: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
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
Ali-D-Akbar
ff2bf588eb PROD-1525 2020-07-29 14:48:50 +05:00
Ali-D-Akbar
8f12875e4a PROD-1530 2020-07-29 14:48:50 +05:00
Ali-D-Akbar
6905f64aa3 PROD-1289 2020-07-29 14:48:50 +05:00
SaadYousaf
a9cf0d84ac PROD-1619 2020-07-29 14:48:50 +05:00
Ali-D-Akbar
8876e7bf25 PROD-1603 2020-07-29 14:48:50 +05:00
Ali-D-Akbar
4d0c491259 PROD-1612 2020-07-29 14:48:50 +05:00
Ali-D-Akbar
d73b41f578 PROD-1605 2020-07-29 14:48:50 +05:00
Aura Milena Alba
e4f28debb7 [BD-10] [DEPR-92] Remove directories that includes pattern-library. (#24602) 2020-07-28 10:21:30 -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
Ali-D-Akbar
ac548e1940 PROD-1534 2020-07-27 18:55:12 +05:00
Zachary Hancock
57de9b2ac6 POST proctored exam settings (#24597) 2020-07-27 09:23:03 -04:00
edX Transifex Bot
0c51f37318 fix(i18n): update translations 2020-07-26 17:46:29 -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
c1ddfe29a3 Add edX Django Rest Framework Extensions CSRF App URLS to Studio 2020-07-24 14:50:16 -04:00
Simon Chen
198c4ad9a0 MST-331 Add cors header configs to CMS so it can be turned on (#24571) 
* MST-331 Add cors header configs to CMS so it can be turned on

* feedback
 2020-07-24 08:09:41 -04:00
Sid Verma
99220e0967 Add "Source from library" XBlock 
This lets the user import a block from a blockstore-based content library into a (modulestore based) course, by copying the block into the course.
 2020-07-24 13:32:37 +05:30
Sankar Raj
0cec351c0c [BD-10] [DEPR-93] Remove font reference from edx-pattern-library in styles and moved OpenSans fonts to static fonts (#24176) 2020-07-23 15:13:59 -04:00
Cory Lee
148b90358f Add Dockerfile (#23088) 
* Add Dockerfile.
* Add gunicorn config files for local development.
* Add .dockerignore file.

Co-authored-by: Joseph Mulloy <jmulloy@edx.org>
Co-authored-by: Fred Smith <derf@edx.org>
Co-authored-by: Adam Blackwell <ablackwell@edx.org>
Co-authored-by: Kyle McCormick <kmccormick@edx.org>
Co-authored-by: Nadeem Shahzad <nshahzad@edx.org>
 2020-07-22 17:45:23 -04:00
Uzair Rasheed
03835a51f3 Merge pull request #170 from edx/azarembok/cert-fix 
PROD-1236: Do not expose user id with certificate URL.
 2020-07-22 16:35:49 +05:00
Ali Akbar
b7fdee226b Merge pull request #185 from edx/sustaining/security-fixes 
Sustaining Xsslint security fixes
 2020-07-22 13:56:54 +05:00
uzairr
4e94304c8c Fix xss in base site template 2020-07-22 02:19:05 +05:00
Andytr1
af072a5158 EDUCATOR-5039 (#24546) 
* EDUCATOR-5039

* EDUCATOR-5039 - pr updates
 2020-07-21 13:36:18 -04:00
Zachary Hancock
c9f5ec3397 disable escalation email requirement (#24551) 2020-07-21 09:45:25 -04:00
Ahmad Bilal Khalid
71bbd9a5ec Fix failing non-indexable tests 2020-07-20 12:06:42 +05:00
edX Transifex Bot
d0b138479f fix(i18n): update translations 2020-07-19 17:36:28 -04:00
uzairr
fb9ba90efe PROD-1236: Do not expose user id with certificate URL. 2020-07-17 22:59:34 +05:00
Michael Roytman
0741c383ad Merge pull request #24431 from edx/mroytman/MST-286-proctored-exam-settings-rest-api 
mroytman/MST-286-proctored-exam-settings-rest-api
 2020-07-17 08:54:51 -04:00
Michael Roytman
6601111982 add rest_api for contentstore app, including a proctored_exam_settings view 2020-07-16 15:52:03 -04:00
Calen Pennington
0e55566d96 Attempt to fix devstack issues with an upgrade of django-ratelimit-backend 2020-07-16 13:56:41 -04:00