Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,428 Commits 1 Branch 0 Tags
72ec00cbb71d0a1d7201dfdcd92462156dbd6152
Commit Graph

60428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uzairr
8ba1d522df fix xss in transcript not found template 
PROD-2017
 2020-08-21 13:31:49 +05:00
uzairr
ffd585cfab fix xss in grading editor template 
PROD-2024
 2020-08-21 13:19:46 +05:00
uzairr
1c737b3dd9 fix xblock outline template 
PROD-2019
 2020-08-21 13:17:38 +05:00
uzairr
636240a400 fix xss in metadata template 
PROD-2015
 2020-08-21 13:11:43 +05:00
uzairr
ec5a1be52b fix xss in transcript replace template 
PROD-2013
 2020-08-21 13:08:43 +05:00
uzairr
4481908b02 fix xss in edit section template 
PROD-2011
 2020-08-21 13:06:35 +05:00
uzairr
57823e16dc fix xss in transcript import template 
PROD-2018
 2020-08-21 13:04:48 +05:00
uzairr
ef014f5d7f Fix xss in transcript upload template 
PROD-2014
 2020-08-21 13:00:30 +05:00
uzairr
103a4f20a6 Fix xss in transcript template 
PROD-2012
 2020-08-21 12:56:30 +05:00
uzairr
e890ec6dd5 Fix xss in team member template 
PROD-2009
 2020-08-21 12:52:27 +05:00
Régis Behmo
288ccc6705 Fix creation of LTIProviderConfig object in admin 
When attempting to create a "Provider Configuration (LTI)" object in the
django admin, the following 500 error was being triggered:

    "Either an icon class or an icon image must be given (but not both)"

This was caused by the `clean()` method of the mother class
(OAuth2ProviderConfig) which checked whether at least the icon_class XOR
icon_list attribute was well defined. In the case of the
LTIProviderConfig objects it isn't, but that's ok because this object
is not meant to be displayed in the login form.

To resolve this issue, we modify the `clean()` method to ensure that at
most icon_class or icon_image is set. Alternatively, we could have set
`visible = False` and then dropped the `visible` column from the
database, but it was deemed too risky.
unused.

Close CRI-205.
 2020-08-21 09:51:12 +02:00
uzairr
643736e613 Fix xss in signatories templates 
PROD-2010
 2020-08-21 12:38:37 +05:00
uzairr
6887ab1c26 Fix xss in course handout template 
PROD-2002
 2020-08-21 12:36:08 +05:00
Syed Muhammad Dawoud Sheraz Ali
0ed780d657 Merge pull request #24825 from edx/dsheraz/TNL-7338-update-val 
update edxval
 2020-08-21 11:07:41 +05:00
DawoudSheraz
5d4e6c62ea update edxval 2020-08-21 09:50:23 +05:00
edX requirements bot
c455d8ade0 Updating Python Requirements 2020-08-21 00:46:21 -04:00
Troy Sankey
3b6b066c72 Cleanup unused CONFIG_ROOT variable and dead code. 
From what I've gleaned, CONFIG_FILE (and LMS_CFG and STUDIO_CFG
environment variables) supercedes CONFIG_ROOT.  There's no code anymore
that reads the value of the CONFIG_ROOT django setting, and in turn the
CONFIG_ROOT environment variable.

Tangentially related to DENG-369
 2020-08-20 16:30:33 -04:00
Felipe Montoya
7813850bc6 Merge pull request #24779 from msegado/master 
Fix double-wrapped exception in capa/inputtypes.py
 2020-08-20 14:48:23 -05:00
David Ormsbee
a23cfda6f4 Merge pull request #21402 from open-craft/paulo/disable_discussion_cache 
Disable caching in forum home
 2020-08-20 13:07:43 -04:00
Kyle McCormick
926a40def0 Enable ORGANIZATIONS_APP for devstack Studio (#24820) 
It is already enabled in devstack LMS, stage LMS/Studio,
and prod LMS/Studio.

However, it is currently disabled in edge LMS/Studio,
and as far as I know, sandbox LMS/Studio as well as the
default Open edX LMS/Studio.

We would like to move towards enabling it globally by
default, and enabling it in devstack Studio would be
a first step towards that.
 2020-08-20 12:19:39 -04:00
Dillon Dumesnil
d75fbde9e7 Merge pull request #24813 from edx/ddumesnil/xml-import-lcm-disable 
Disable updating Library Content children during import
 2020-08-20 09:10:42 -07:00
Dillon Dumesnil
79e96af197 Disable updating Library Content children during import 2020-08-20 07:26:27 -07:00
uzairr
7bc17c7dd9 Ratelimit the registration endpoint 
PROD-880
 2020-08-20 18:38:26 +05:00
Awais Qureshi
8c43855cfe Merge pull request #24810 from edx/testeng/bokchoy_auto_cache_update_d2adb857a0d748001be791cd8e8b82219b4d943c 
Bokchoy Testing DB Cache update
 2020-08-20 17:47:01 +05:00
Kyle McCormick
a16ad52250 Devstack: Allow login redirection from LMS to several MFEs (#24808) 
I added all MFEs whose ports I know from the Devstack
README. Other MFE authors should feel free to add their
'localhost:PORT' entry here.
 2020-08-20 08:28:28 -04:00
Ali Akbar
847cd4af8e Merge pull request #24806 from edx/aakbar/PROD-924 
allow cursor to be in the whole text area
 2020-08-20 14:55:44 +05:00
M. Zulqarnain
9e62f5fb30 Merge pull request #24817 from edx/jenkins/upgrade-python-requirements-e6132cd 
Python Requirements Update
 2020-08-20 14:27:06 +05:00
edX requirements bot
47894e419a Updating Python Requirements 2020-08-20 00:53:34 -04:00
edX Transifex Bot
e6132cdf06 geoip2: update maxmind geolite country database 2020-08-19 17:13:30 -04:00
Ali-D-Akbar
183da5e020 allow cursor to be in the whole text area 2020-08-20 00:27:06 +05:00
Ned Batchelder
8da8a2c915 Merge pull request #24812 from mahyard/mark-message-to-be-extracted 
Put two messages inside interpolate function to be extracted
 2020-08-19 14:54:17 -04:00
Dave St.Germain
66e2c7a5ea Merge pull request #24811 from edx/dcs/upgrade 
Upgraded LTI and ORA2 xblocks
 2020-08-19 14:34:28 -04:00
Mahyar Damavand
6062aaa860 Put two messages inside interpolate function to be extracted 2020-08-19 22:51:29 +04:30
Dave St.Germain
3ec8486dd3 Upgraded LTI and ORA2 xblocks 2020-08-19 13:48:27 -04:00
David Ormsbee
a0762c06ef Merge pull request #21413 from open-craft/kshtij/problem-response-multi-root-and-fitler 
[BB-873] Support for filters, and multiple roots in problem response reports
 2020-08-19 13:07:24 -04:00
edX cache uploader bot
322b572884 Updating Bokchoy testing database cache 2020-08-19 11:29:54 -04:00
Alexander J Sheehan
3ef3b8f0fc Merge pull request #24807 from edx/alex-sheehan-edx/bumping-entperise-version-3.6.3 
bumping edx enterprise version to 3.6.3
 2020-08-19 11:24:43 -04:00
Alexander Sheehan
f417128ded bumping edx enterprise version 2020-08-19 10:39:23 -04:00
Ali Akbar
e7c3237fd8 Merge pull request #24805 from edx/revert-24738-aakbar/PROD-924 
Revert "allow cursor to be in the whole text area"
 2020-08-19 18:57:00 +05:00
Kyle McCormick
885627e14f Extend expiration of DEPRECATE_OLD_COURSE_KEYS_IN_STUDIO toggle (#24804) 
TNL-7423
 2020-08-19 09:53:14 -04:00
Ali Akbar
38b1615484 Revert "allow cursor to be in the whole text area" 2020-08-19 18:14:45 +05:00
Ahtisham Shahid
6e507e1a49 Revert "Instructor Dashboard Redesign" (#24802) 
* Revert "New vs Old Data-Download UI. (#24094)"

This reverts commit 52669c47f1.

* Fixed linter issues
 2020-08-19 17:17:20 +05:00
Ali Akbar
2578877d58 Merge pull request #24738 from edx/aakbar/PROD-924 
allow cursor to be in the whole text area
 2020-08-19 16:23:43 +05:00
Ali-D-Akbar
c217d7c134 allow cursor to be in the whole text area 2020-08-19 15:37:15 +05:00
Ahtisham Shahid
5d38314fc5 Fixed xss lint issues for prod-1465/66 2020-08-19 13:59:36 +05:00
Ahtisham Shahid
e14e944e86 Fixed xsslinter issue for PROD-1527/28 2020-08-19 13:59:36 +05:00
M. Zulqarnain
2c33fc249d Merge pull request #24799 from edx/jenkins/upgrade-python-requirements-6f06680 
Python Requirements Update
 2020-08-19 13:37:59 +05:00
edX requirements bot
e0097ae5c3 Updating Python Requirements 2020-08-19 00:52:18 -04:00
Kshitij Sobti
2eff127e8d Add support for generating problem response reports for multiple blocks, or filtered block types. 
This change adds support for specifying multiple root blocks while generating
problem response reports. It also allows specifying a block type filter so that
only blocks of the filtered types will be included in the report.

Finally, this change also consistenly uses absolute path for the location in the
report instead of relative paths.
 2020-08-18 22:28:05 +05:30
Dillon Dumesnil
6f06680c4f Merge pull request #24796 from edx/ddumesnil/showanswer-improvement 
AA-307: Turn showanswer override back on
 2020-08-18 09:00:57 -07:00