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

50577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adeel Khan
b5aefd9e83 Fix courseware's app for xss injections. 
PROD-465
 2019-07-25 23:52:49 +05:00
David Ormsbee
5a2c3149a0 Merge pull request #21222 from edx/revert-20723-guruprasad/fix-rcb 
Revert "Fix the unpredictable order randomization issue with randomized content blocks"
 2019-07-25 14:30:34 -04:00
David Ormsbee
b1f3d2cef2 Revert "Fix the unpredictable order randomization issue with randomized content blocks" 2019-07-25 13:42:20 -04:00
Feanil Patel
e1b9869b26 Merge pull request #21194 from edx/feanil/remove_parsepy 
DEPR-41 Remove parsepy
 2019-07-25 10:25:08 -04:00
Dave St.Germain
75b0afe721 Merge pull request #21162 from edx/mroytman/EDUCATOR-4434-gradebook-user-counts 
add number of total users and number of filtered users to the gradebo…
 2019-07-25 09:54:09 -04:00
George Babey
82a010b3b2 Merge pull request #21202 from edx/hammad/WL-1951 
WL-1951 | White Label: MITxPRO Footer Links Not Working
 2019-07-25 09:45:40 -04:00
irfanuddinahmad
a6045f9d13 Merge pull request #21217 from edx/iahmad/ENT-1954-Reformat-Logs-For-Enterprise-SSO-Workflows 
ENT-1954: Reformatted logging for third party auth
 2019-07-25 17:31:40 +05:00
irfanuddinahmad
df1c7f553a reformatted logging 2019-07-25 16:10:48 +05:00
Ayub
877168f72b Merge pull request #21081 from edx/INCR-420 
INCR-420 python3 compatibility
 2019-07-25 15:50:03 +05:00
Ayub
c5a4154400 Merge pull request #21098 from edx/INCR-428 
INCR-428 python3 compatbility
 2019-07-25 15:49:28 +05:00
Aarif
4b1ef3005e Merge pull request #21116 from edx/INCR-447 
INCR-447 Python 3 compatibility
 2019-07-25 14:51:17 +05:00
Ayub
dc9f67c618 Merge pull request #21096 from edx/INCR-427 
INCR-427 python3 compatibility
 2019-07-25 14:50:38 +05:00
Ayub
2a22ff3890 Merge pull request #21080 from edx/INCR-419 
INCR-419 python3 compatibility
 2019-07-25 14:50:06 +05:00
Aarif
5255799845 Merge pull request #21085 from edx/INCR-423 
INCR-423 Python 3 compatibility
 2019-07-25 14:34:21 +05:00
Uzair Rasheed
408ca5645f Merge pull request #21050 from edx/LEARNER-3761/capa-grading-exception 
Restrict grading endpoints in LMS
 2019-07-25 14:23:24 +05:00
Ayub
4640641c9c Merge pull request #21201 from edx/BOM-69 
BOM-69
 2019-07-25 14:23:10 +05:00
adeel khan
09e4835c48 Merge pull request #21123 from edx/part4_edx_ace_templates 
Fix edx-ace templates
 2019-07-25 13:49:09 +05:00
Adeel Khan
7d9be69112 Fix edx-ace templates 
This patch is part of multiple PR's to
protect templates against xss attack

PROD-465
 2019-07-25 12:51:05 +05:00
Aarif
cb530bf788 Merge pull request #21113 from edx/INCR-444 
INCR-444 Python 3 compatibility
 2019-07-25 12:43:33 +05:00
Aarif
60c6f4ff2d Merge pull request #20987 from edx/INCR-332 
INCR-332 Python 3 compatibility
 2019-07-25 12:40:50 +05:00
adeel khan
a1fed395ee Merge pull request #21121 from edx/part3_template_fix 
Fix edx templates.
 2019-07-25 12:19:57 +05:00
Adeel Khan
632bee5177 Fix edx templates. 
PROD-465
 2019-07-25 10:44:37 +05:00
Michael Roytman
77dc0fa9f0 add number of total users and number of filtered users to the gradebook API 2019-07-24 23:02:04 -04:00
Farhanah Sheets
889f5e4e58 Merge pull request #21212 from edx/fsheets/PROD-500 
Fix: Do not compare Software Secure expiry_date when NULL
 2019-07-24 17:05:18 -04:00
edX Transifex Bot
99868f9fca geoip2: update maxmind geolite country database 2019-07-24 16:52:24 -04:00
Farhanah Sheets
fed5322725 Filter NULL expiry_date from SoftwareSecure filter query 2019-07-24 16:44:38 -04:00
David Ormsbee
cffcce7df0 Merge pull request #20723 from open-craft/guruprasad/fix-rcb 
Fix the unpredictable order randomization issue with randomized content blocks
 2019-07-24 16:08:24 -04:00
David Ormsbee
670540225a Merge pull request #20944 from open-craft/fix-capa-editor-html 
Fix: Malformed HTML in capa problem studio_view
 2019-07-24 16:02:11 -04:00
Guruprasad Lakshmi Narayanan
d7647c66e3 Select children again when current children don't match the selections 
This prevents errors when the current children do not match the
selected children any more.
 2019-07-25 00:58:11 +05:30
Guruprasad Lakshmi Narayanan
df4aee23b9 Fix the order randomization behaviour of Randomized Content Block 
The Randomized Content Block XBlock only randomizes the selection of
the children blocks and has unpredictable randomization of
the order of the selected child blocks due to the usage of sets, which
are unordered, for storing the selected blocks. This becomes apparent
when all the available child blocks in a library are chosen for a
Randomized Content Block, to randomize just the order of the child
blocks and not just the selection of the blocks. The order of the
selected blocks ends up being similar for multiple learners.

This change modifies the XBlock to store the selected child blocks in
a list, instead of a set, after randomly shuffling them.
 2019-07-25 00:58:11 +05:30
Calen Pennington
f3daa42340 Merge pull request #21143 from cpennington/who-tests-what-nightly 
Who tests what nightly
 2019-07-24 12:31:26 -04:00
Calen Pennington
5025567711 Add paver commands and environment variables to capture and run coverage-driven test selection 2019-07-24 12:06:07 -04:00
Feanil Patel
1f7b12a38d Remove references to push notifications. 
Push notifications was only ever setup to connect to Parse.com a service
that has been discontinued.  Since we haven't replaced the functionality
for a few years now, remove this dead code.

In cms/templates/js/course_info_update.underscore we're allowing content
to not be escaped because this is by design according to the tests.
Long term there should be a better fix for this but for now this is
intended behavior.
 2019-07-24 11:45:46 -04:00
edX Transifex Bot
00d1003797 fix(i18n): update translations 2019-07-24 11:00:56 -04:00
Mushtaq Ali
2004e88378 Merge pull request #21204 from edx/mushtaq/ent-version-bump 
Enterprise version bump
 2019-07-24 19:56:50 +05:00
Muhammad Ammar
d7e5863714 Enterprise version bump 2019-07-24 14:21:49 +00:00
uzairr
9276aac8d2 Restrict grading endpoints in LMS 
Cuurently, grading endpoints in capa module are vulnerable as they
are not restricted.To avoid it, changes have been made so that
they are available only for logged-in users.

LEARNER-3761
 2019-07-24 19:20:13 +05:00
Calen Pennington
1823d9f098 Add django app for running Coverage who-tests-what in bokchoy 2019-07-24 10:13:46 -04:00
aarif
8f6569f462 ran python-modernize and isort on files mentioned in INCR-444 
changes made to comply with quality
 2019-07-24 19:07:55 +05:00
Hammad Ahmad Waqas
22b650741b reverting changes in MKTG_URL_LINK_MAP 2019-07-24 18:14:09 +05:00
Aarif
8526a989c3 Merge pull request #21115 from edx/INCR-446 
INCR-446 Python 3 compatibility
 2019-07-24 16:21:05 +05:00
Aarif
f2864f8e5c Merge pull request #21075 from edx/INCR-410 
INCR-410 Python 3 compatibility
 2019-07-24 16:04:26 +05:00
Muhammad Ammar
9525dafde0 Merge pull request #21186 from edx/ammar/upgrade-edx-enterprise-and-edx-rbac 
unpin edx-rbac
 2019-07-24 16:02:49 +05:00
Ayub khan
ad7c77493a -upgrade ora to 2.2.6 2019-07-24 15:37:00 +05:00
edX Transifex Bot
7731b0e172 fix(i18n): update translations 2019-07-24 06:08:36 -04:00
aarif
86b810a23a ran python-modernize and isort on files mentioned in INCR-410 
Updated the file as suggested

ran python-modernize and isort on files mentioned in INCR-410

Updated the file as suggested

changes made to comply with quality

ran python-modernize and isort on files mentioned in INCR-410

Updated the file as suggested

changes made to comply with quality
 2019-07-24 09:50:13 +00:00
muhammad-ammar
3b1a35ee39 upgrade edx-enterprise and edx-rbac 2019-07-24 13:35:04 +05:00
edX Transifex Bot
0544c6d826 fix(i18n): update translations 2019-07-24 03:08:58 -04:00
Ayub
78f9a0d19c Merge pull request #21079 from edx/INCR-418 
INCR-418 python3 compatibility
 2019-07-24 09:48:27 +05:00
Ayub
a5f9cb5227 Merge pull request #21078 from edx/INCR-417 
INCR-417 python3 compatibility
 2019-07-24 09:47:23 +05:00