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

19697 Commits

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
b1f3d2cef2 Revert "Fix the unpredictable order randomization issue with randomized content blocks" 2019-07-25 13:42:20 -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
Aarif
4b1ef3005e Merge pull request #21116 from edx/INCR-447 
INCR-447 Python 3 compatibility
 2019-07-25 14:51:17 +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
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
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
Farhanah Sheets
fed5322725 Filter NULL expiry_date from SoftwareSecure filter query 2019-07-24 16:44:38 -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
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
adeelehsan
43604eb6f7 Merge pull request #21188 from edx/aehsan/prod-410/translation_strings_are_passed_to_zendesk 
Translation moved to field level for questions in financial form
 2019-07-23 18:17:44 +05:00
adeelehsan
9fb1b53aa7 Translation removed from constants in financial form 
PROD-410
 2019-07-23 17:31:10 +05:00
adeel khan
561aa62da7 Merge pull request #21187 from edx/adeel/fix_wiki_template 
Fix wiki template missing endfilter expression
 2019-07-23 17:26:26 +05:00
noraiz-anwar
570cd673ef change task_input field's type from CharField to TextField 2019-07-23 17:21:03 +05:00
Adeel Khan
0b9019c618 Fix wiki template missing endfilter expression 2019-07-23 13:13:55 +05:00
Aarif
00717a5f77 Merge pull request #21117 from edx/INCR-448 
INCR-448 Python 3 compatibility
 2019-07-23 12:26:25 +05:00
Aarif
5ec20b98b1 Merge pull request #21112 from edx/INCR-435 
INCR-435 Python 3 compatibility
 2019-07-22 14:28:26 +05:00
Uzair Rasheed
eed0dfbbe4 Merge pull request #21149 from edx/PROD-305/add-credit-mode-enrollment 
Add credit mode in support enrollment tool.
 2019-07-21 00:45:52 +05:00
Farhanah Sheets
7385841c4b Merge pull request #21135 from edx/waheed/PROD-478-move-sso-button 
Move secondary SSO login button.
 2019-07-19 11:30:35 -04:00
Christie Rice
fee8e17f95 REVMI-341 Stop sending lms_client_id in jwt sent to ecommerce (#21167) 2019-07-19 10:46:46 -04:00
Ayub khan
3a04fbd37a INCR-440 python3 compatibility 2019-07-19 09:54:52 -04:00
Ayub khan
99060623ac INCR-442 python3 compatibility 2019-07-19 09:53:01 -04:00
Feanil Patel
b94b211c29 In python3 force_unicode is renamed to force_text. 2019-07-19 09:48:10 -04:00
Feanil Patel
d9c9d7bab9 Deal with NoneType access. 
The `NoneType` object is not available from the `types` module in
python 3. This is a workaronud to deal with that.
 2019-07-19 09:48:10 -04:00
Feanil Patel
e51fae3784 letters doesn't exist in python 3.6 
Use `ascii_letters` instead which is a reasonable alternative for our
usecases.
 2019-07-19 09:48:10 -04:00
uzairr
07821927e2 Add credit modein support enrollment tool. 
Currently, enrollment support tool is only allowing support members
to change course enrollment only one of the two modes i.e. audit and
verified.To move a learner other than these modes,they need to ping
devops.To broaden the scope of enrollment support tool,changes have
been done so that enrollment would be changed to other modes as well.

PROD-305
 2019-07-19 18:14:35 +05:00
Awais Qureshi
6edf9766df Merge pull request #21134 from edx/awais786/INCR-443 
INCR-443
 2019-07-19 13:46:34 +05:00
Awais Qureshi
3d2e0f7dde Merge pull request #21133 from edx/awais786/INCR-445 
INCR-445
 2019-07-19 13:44:38 +05:00
David Ormsbee
a712f1f93b Remove full table scan of VerificationDeadline. (#21119) 
* Remove full table scan of VerificationDeadline.

Before this commit, we were doing a full table scan of
student_verificationdeadline, loading the results into a giant
dict, and reading/writing that to the cache. This was fine when the
code was introduced and there were dozens of courses, but now that
we're over 12K courses, it's becoming a major performance issue for
the Student Dashboard.

This uses a subquery to the course enrollment table so that we're
only ever pulling back the deadlines to a student's enrolled courses
for any given request. It removes the cache access entirely.
 2019-07-17 10:25:08 -04:00
Waheed Ahmed
a310c87d8e Move secondary SSO login button. 
Moved secondary SSO login button to the top of email and
password fields.

PROD-478
 2019-07-17 13:29:16 +05:00
nadeemshahzad
4a93420946 defaults to common.py CMS 2019-07-17 12:04:20 +05:00
Amit
b8b910d132 INCR-460: Make compatible with Python 3.x and disable: import-error f… (#20989) 
* INCR-460: Make compatible with Python 3.x and disable: import-error for urlparse

* INCR-460: Fixes for useless suppression
 2019-07-16 14:28:03 -04:00
Amit
0c513e2139 INCR-449: Make compatible with Python 3.x (#21100) 
* INCR-449: Make compatible with Python 3.x

* INCR-449: Fixes for line long
 2019-07-16 10:41:06 -04:00
aarif
fd3a83236a ran python-modernize and isort on files mentioned in INCR-446 
changes made to comply with quality

changes made to comply with quality

changes made to comply with quality
 2019-07-16 15:14:12 +05:00
arbisoft
91aac28ca7 Fixing python-modernize issues. 2019-07-16 13:16:03 +05:00
arbisoft
6c39ec43be Fixing python-modernize issues. 2019-07-16 12:34:28 +05:00
Jillian Vogel
d3ce0b759e SE-1151 Campus.il Inlines all 36 discussion underscore templates (fixed) (#21094) 
Inlines all 36 discussion underscore templates

imported by lms/templates/discussion/_underscore_templates.html
to reduce file system load when displaying inline discussion blocks.

Ignored error where fix required changing the translated text string,
due to differences between underscore and HtmlUtils format strings.
 2019-07-15 20:51:42 -04:00
Amit
e96a789baf INCR-450: Make compatible with Python 3.x (#21097) 2019-07-15 11:57:37 -04:00
Uzair Rasheed
d9e8713077 Merge pull request #21103 from edx/INCR-453/python-modernize-350-of-380 
Python-modernize on edx-platform (350 of 380)
 2019-07-15 13:39:04 +05:00
Uzair Rasheed
b48dae74ca Merge pull request #21101 from edx/INCR-441/python-modernize-338-of-380 
Python-modernize on edx-platform (338 of 380)
 2019-07-15 13:38:43 +05:00