Commit Graph

51562 Commits

Author SHA1 Message Date
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
a0e4adbaa5 Archive the combined python coverage file 2019-07-24 13:37:30 -04:00
Calen Pennington
fdd212248a Check the test-suite specific coverage file, and upload it earlier in the process 2019-07-24 13:13:30 -04:00
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
Usman Khalid
8dfc8e5fda Convert AboutModule, CourseInfoModule, HtmlModule and StaticTabModule to XBlocks. 2019-07-24 20:19:44 +05: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
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
Feanil Patel
dd0eef393d Update matplotlib and numpy in codejail sandbox. 2019-07-23 17:11:44 -04: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
Ayub
e8fa5a4fc9 Merge pull request #21164 from edx/INCR-347-2
INCR-347 python3 compatibility
2019-07-23 13:00:08 +05:00
Ayub khan
0698c10d29 INCR-412 python3 compatibility 2019-07-23 12:57:16 +05:00
Ayub
6db7a08268 Merge pull request #21072 from edx/INCR-408
INCR-408 python3 compatibility
2019-07-23 12:33:40 +05:00