Commit Graph

54230 Commits

Author SHA1 Message Date
Michael Terry
cce2c0e015 Merge pull request #23858 from edx/mikix/less-upselling
Reduce upselling on Dates tab
2020-04-30 15:55:37 -04:00
Michael Terry
70c9170ed2 Reduce upselling on Dates tab
The dates tab has a lot of redundant calls to action around
upgrading to verified track. This replaces them with a single
banner at the top of the page.

AA-102
2020-04-30 15:31:58 -04:00
Calen Pennington
810f29c12c Merge pull request #23855 from cpennington/aa-138-reset-dates-graded-only
Only show the resets date banner if you have missed the due date on a…
2020-04-30 14:02:39 -04:00
Calen Pennington
ff88f3d423 Only show the resets date banner if you have missed the due date on a graded subsection
[AA-138]
2020-04-30 11:50:45 -04:00
David Ormsbee
d1da021d77 Merge pull request #23469 from open-craft/blockstore-race-condition
Cache Blockstore XBlock field data per thread, not per-process
2020-04-30 11:33:43 -04:00
David Ormsbee
431fdb9009 Merge pull request #23233 from open-craft/blockstore-library-links
REST API for managing Content Library bundle links
2020-04-30 11:32:48 -04:00
Zachary Hancock
f9bd748169 remove bulk write of CourseAccessRoleAssignment (#23849) 2020-04-30 11:05:15 -04:00
Robert Raposa
2cde81e190 fix get_worker_test_list.py (#23842)
* fix get_worker_test_list.py

The test name is not always at the same index in the line, so pull
it from the regex instead.
2020-04-30 11:04:25 -04:00
julianajlk
d1ee55d57f Add alert banner to Contact Us Page with Covid-19 message (#23825)
PROD-1480
2020-04-30 11:01:46 -04:00
edX requirements bot
5d0ec0be97 Updating Python Requirements (#23853) 2020-04-30 10:39:40 -04:00
Waheed Ahmed
07465b2b35 Ratelimit password reset by email instead of IP.
Also changed `password_reset` endpoint rate limit configuration to
1/minute from 30/5 minutes.

PROD-1427
2020-04-30 14:50:47 +05:00
edX Transifex Bot
6fac7449fb geoip2: update maxmind geolite country database 2020-04-29 16:54:03 -04:00
Robert Raposa
c6e9e545f9 fix flaky tests (#23848)
It doesn't look like this setting was required, and because it didn't
use override_settings, it broke other tests.
2020-04-29 15:42:17 -04:00
stvn
d5ed3fcc22 Merge PR #23846 fix/learn-mfe/resize-iframe
* Commits:
  Stop skipping chromeless iframe resize onload event
2020-04-29 11:43:06 -07:00
stvn
6c5edee219 Stop skipping chromeless iframe resize onload event
in the case where the MutationObserver has already tried resizing the
iframe prior to it fully loading.
2020-04-29 11:04:12 -07:00
Zachary Hancock
cb44075ace only query due_dates for courses in progress (#23823) 2020-04-29 12:15:03 -04:00
Feanil Patel
d23393d76a Merge pull request #23835 from edx/jenkins/upgrade-python-requirements-70600d7
Python Requirements Update
2020-04-29 09:32:04 -04:00
Dave St.Germain
0c67d91b16 Merge pull request #23774 from edx/dcs/tabfields
TNL-7148 -- support external links in courseware API
2020-04-29 09:31:14 -04:00
Dave St.Germain
1354172592 Merge pull request #23665 from edx/dcs/user-service
Add support for external user ids to the xblock user service.
2020-04-29 09:23:47 -04:00
Dave St.Germain
fbc18460ca Add support for external user ids to the xblock user service. 2020-04-29 08:55:40 -04:00
Dave St.Germain
4548337114 Merge pull request #23826 from edx/robrap/fix-is_in_memory_db-issue
fix issue with is_in_memory_db
2020-04-29 08:51:02 -04:00
edX requirements bot
033e79b688 Updating Python Requirements 2020-04-29 06:51:02 -04:00
Tim McCormack
70600d79d7 Revert "Fix Jenkins virtualenv issue that masked stale dependency" (#23828)
* Revert "Use pip-sync to make sure that dep cache tarball can go safely stale"

This reverts commit d435f4cd3e.

* Revert "Extract worker setup into own shell script, as much as possible"

This reverts commit 0a079e757c.
2020-04-29 02:15:57 +00:00
Robert Raposa
e63a7a4920 Revert "remove tests causing flakiness (#23827)" (#23830)
This reverts commit be1aaa00ff.
2020-04-28 17:31:45 -04:00
Robert Raposa
b74acce64c fix issue with is_in_memory_db
For mysql, it seems `is_in_memory_db` does not even exist. Ensure it
exists before calling it.
2020-04-28 16:19:15 -04:00
Robert Raposa
be1aaa00ff remove tests causing flakiness (#23827)
These removed tests can be restored once someone works out why they
were causing flakiness elsewhere and fix the problem.

Reverts tests added in:
dca50aacc3
2020-04-28 16:12:29 -04:00
David Ormsbee
617fe431e1 Merge pull request #23246 from open-craft/samuel/lx-744-more-metadata
[SE-2264] [LX-744] Return more metadata in xblock api
2020-04-28 15:10:27 -04:00
Braden MacDonald
cb58873879 Cache Blockstore XBlock field data per thread, not per-process
The cache in the previous version of this code was unwittingly being
shared among all threads, and an occasional race condition would result
in the .children field of some XBlocks containing duplicate entries.

I tried to find other ways to keep the existing cache design and let it
be shared among all the threads (which would be more efficient), but I
couldn't find any clean way of doing it (and even then, this code was
not written with the intention of being used in a multi-threaded way).
So to keep the fix simple, I made the block data cache thread-local
instead of process-local. That eliminated the bug.

Technical details:

The big challenge with this code in the first place was due to the
parse_xml API of XBlocks, which instantiates the XBlock instance and
_then_ sets field data on it and returns it, as there is no mechanism
available to distinguish that from the case of instantiating an XBlock
(using previously loaded/cached field data) and then deliberately
changing its field values. In particular, parse_xml sets the 'children'
field just by calling self.children.append(...) but never explicitly
initializes self.children to [] first, so it's necessary for the field
data store to have a mechanism for setting self.children = [] when
parsing begins, but it's hard to know "when parsing begins" in general.

This is made more challenging since the BlockstoreFieldData design ties
field data changes to the XBlock instance itself (using a weakkey), but
it's impossible to get a reference to the XBlock instance before calling
parse_xml, and since the BlockstoreFieldData design uses a pass-through
approach where fields that aren't being actively changed are read from
the cache; since it doesn't know when children is being initialized vs.
being modified, it would sometimes pass-through and start one thread's
changes with the final result from another thread.

Anyhow, the bottom line is that avoiding unintentional multithreading
here solves the problem.

If we want the field data cache to be shared among threads, it might as
well be rewritten to use memcached and shared among all processes too.
That would be a very good performance boost but would take up a lot more
memory in memcached. Also the rewrite may be challenging due to the
aforementioned nuances of the XBlock parse_xml / construct_xblock /
add_node_as_child APIs. Perhaps modifying the runtime to use a
completely separate fielddata implementation for parsing vs. loading a
parsed+cached XBlock would do it.
2020-04-28 12:01:44 -07:00
stvn
0f5c474f8f Merge PR #23820 debug/mfe-iframe-resize
* Commits:
  Add logging to Learning MFE iframe, temporarily
2020-04-28 10:55:59 -07:00
stvn
2ddc35cd79 Add logging to Learning MFE iframe, temporarily
to debug Firefox event handling that cannot be reproduced locally.

See TNL-7187 [1] for more details.

- [1] https://openedx.atlassian.net/browse/TNL-7187
2020-04-28 10:08:21 -07:00
Tim McCormack
d435f4cd3e Use pip-sync to make sure that dep cache tarball can go safely stale
This "fixes" egg-links in a really hacky way to compensate for the lack
of a real relocatable virtualenv.
2020-04-28 12:56:31 -04:00
Tim McCormack
0a079e757c Extract worker setup into own shell script, as much as possible
This also changes DJANGO_REQUIREMENT to be a single file arg.
2020-04-28 12:56:31 -04:00
edX requirements bot
cb6625aa0f Updating Python Requirements (#23821) 2020-04-28 08:48:50 -04:00
Ahtisham Shahid
f14946d1de Merge pull request #23749 from edx/ahtisham/PROD-1476
Disabled copy/paste in confirm email
2020-04-28 13:16:01 +05:00
Ahtisham Shahid
8af94ec72a Disabled copy/paste in confirm email
Created sorting for email field

updated tests

Fixed sorting issue in registration form

Fixed sorting issue in registration form

Fixed sorting issue in registration form

Added missing items in env and updated order logic

Added missing items in env and updated order logic
2020-04-28 11:51:01 +05:00
Michael Terry
f6a4ed3eff Merge pull request #23818 from edx/mikix/update-lti-xblock
Bump xblock-lti-consumer to 1.2.6
2020-04-27 11:52:05 -04:00
edX requirements bot
c4caea6061 Updating Python Requirements (#23816) 2020-04-27 11:49:41 -04:00
Michael Terry
ec193538b8 Bump xblock-lti-consumer to 1.2.6
This adds a graded icon for LTI units. This was meant to go into
a recent commit, but I only updated github.in not the txt requirement
files.

AA-75
2020-04-27 10:33:38 -04:00
Dave St.Germain
003d7faac2 Merge pull request #23728 from edx/dcs/dashboard
Refactor instructor dashboard access
2020-04-27 10:25:20 -04:00
Feanil Patel
f1da88813a Merge pull request #23811 from edx/feanil/update_settings_docs
Update some really out of date docs for settings.
2020-04-27 10:19:48 -04:00
Michael Terry
c5078aa063 Merge pull request #23803 from edx/mikix/lti-icons
Show graded icons in more places
2020-04-27 10:19:38 -04:00
adeel khan
6a5e2807ba Merge pull request #23817 from edx/transifex-bot-update-translations2020-04-27
fix(i18n): update translations
2020-04-27 18:08:02 +05:00
Waheed Ahmed
dca50aacc3 added tests for revoke program cert task 2020-04-27 16:35:36 +05:00
Waheed Ahmed
6a7dc067da Add revoke program certificate task.
Upon invalidating course certificate, revoke related program certificates
as well.

PROD-1271
2020-04-27 16:35:36 +05:00
edX Transifex Bot
ee611d623c fix(i18n): update translations 2020-04-27 11:21:00 +00:00
adeel khan
196dcf7fb4 Merge pull request #23813 from edx/adeel/prod_1504_fix_spanish_translation
Fix discussion template for translations.
2020-04-27 14:09:10 +05:00
Adeel Khan
5fa34b4df1 Fix discussion template for translations.
A parsing error was causing underscore template
not to get processed during message
extractions and to be available on transifex.

PROD-1504
2020-04-27 12:02:46 +05:00
Ned Batchelder
82159ae168 Merge pull request #23790 from eduNEXT/lmm/fix_comment
Fix docstring of retrieve_last_sitewide_block_completed
2020-04-25 13:11:57 -04:00
Feanil Patel
f5da00641b Update some really out of date docs for settings. 2020-04-24 15:33:05 -04:00
Michael Terry
0f81765ac7 Show graded icons in more places
In the course outline, if a subsection has any graded content,
show a graded icon (the pencil icon).

Also, show the graded icon for LTI xmodule units (xblocks is a
different repo, but will get same treatment).

AA-75
2020-04-24 14:16:32 -04:00