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

50551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
arbisoft
dbd66707e2 https://openedx.atlassian.net/browse/BOM-68 
Upgrade the django-wiki version.
 2019-07-25 14:29:57 +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
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
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
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
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
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
Ayub
6b034760e0 Merge pull request #21077 from edx/INCR-416 
INCR-416 python3 compatibility
 2019-07-24 09:46:03 +05:00
Ayub
bf47019e4c Merge pull request #21076 from edx/INCR-414 
INCR-414 python3 compatibility
 2019-07-24 09:44:48 +05:00
Douglas Hall
fbc2c3899e Upgrade edx-enterprise to 1.8.2. (#21195) 2019-07-23 16:27:14 -04:00
David Ormsbee
a84e3b2252 Merge pull request #20819 from open-craft/kshitij/allow-specifying-mongo-auth-source 
[BB-1289] Add support for MongoDB authentication database
 2019-07-23 16:15:33 -04:00
Kshitij Sobti
61bb9bc6e2 Add support for using an authentication database for MongoDB. 
A popular convention is to have user accounts stored in a separate authentication
database. This change add support for configuring edx-platform to work with
such a setup.
 2019-07-24 01:16:33 +05:30
Dave St.Germain
e95e87dda8 Merge pull request #21193 from edx/dcs/upgrade 
Make upgrade
 2019-07-23 15:30:04 -04:00
Dave St.Germain
85b24624ce Make upgrade 2019-07-23 14:28:19 -04:00
Ned Batchelder
87c7cbde4d Merge pull request #21191 from edx/nedbat/more-docs 
Move existing docs down a level to make room for more
 2019-07-23 12:07:46 -04:00
Ned Batchelder
83f66af978 Merge pull request #21138 from edx/nedbat/master-wtw 
Who-tests-what, rebased onto master, with make upgrade
 2019-07-23 11:48:47 -04:00
Hasnain Naveed
3faf987fc1 Merge pull request #21189 from edx/hasnain-naveed/WL-1948 
WL-1948 | Added cornerstone in CMS.
 2019-07-23 18:26:52 +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
hasnain-naveed
c42d7de780 WL-1948 | Added cornerstone in CMS. 2019-07-23 17:39:16 +05:00
Ned Batchelder
3b69fe0b47 Move existing docs down a level to make room for more 2019-07-23 08:31:15 -04: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
Ayub
f2be56c3fb Merge pull request #21074 from edx/INCR-412 
INCR-412 python3 compatibility
 2019-07-23 14:25:17 +05:00
Aarif
dc6e72652a Merge pull request #21045 from edx/INCR-391 
INCR-391 Python 3 compatibility
 2019-07-23 13:28:49 +05:00
Aarif
f31a5eaeef Merge pull request #21043 from edx/INCR-390 
INCR-390 Python 3 compatibility
 2019-07-23 13:28:14 +05:00
Adeel Khan
0b9019c618 Fix wiki template missing endfilter expression 2019-07-23 13:13:55 +05:00