Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,205 Commits 1 Branch 0 Tags
033e79b68802f7e96e39ce4b881cd6139d07eeba
Commit Graph

54205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Alex Dusenbery
1b1c6c756f Add pywatchman and remove pyinotify as a local requirement. 2020-04-24 13:33:39 -04:00
edX cache uploader bot
0c1d49ce96 Updating Bokchoy testing database cache (#23809) 2020-04-24 13:24:06 -04:00
edX requirements bot
257bb71734 Python Requirements Update (#23806) 2020-04-24 12:40:46 -04:00
Awais Jibran
a9efd30c4c Merge pull request #23788 from edx/shortcct-digest-pref-call 
Short Circuit Digest preferences call on Discussion Home Page
 2020-04-24 19:52:11 +05:00
edX cache uploader bot
565411d726 Updating Bokchoy testing database cache (#23800) 2020-04-24 09:52:19 -04:00
Feanil Patel
b80a19cdcc Merge pull request #23804 from edx/feanil/remove_coercion 
We don't run into this case anymore so remove it.
 2020-04-24 09:11:59 -04:00
Awais Jibran
158b99f1c9 Short Circuit Digest preferences call on Discussion Home Page 2020-04-24 16:00:46 +05:00
Saad Yousaf
1929c3be63 Merge pull request #23796 from edx/saad/PROD-999-fix-js-flaky-test 
[PROD-999] - Fixing root cause of flaky JS test for discussions.
 2020-04-24 14:23:26 +05:00
Feanil Patel
ff6c0dfa6b We don't run into this case anymore so remove it. 
This was added in here as a shim to catch places that were still using
the old version of these models that had an attribute called course_id
instead of the `course` foreign key.  After monitoring production for
two weeks, we can be pretty confident that we've caught most places that
do this.  Removing this code since it should no longer be needed.
 2020-04-23 16:27:12 -04:00
Robert Raposa
5de9eed420 ARCHBOM-1093: Fix unit test enable-migrations (#23789) 
* fix old migrations
* fix a test
* fix enable-migrations cmd argument
* enhance verbose logging to log migrations
* update testing doc with help
 2020-04-23 14:04:29 -04:00
Diana Huang
5173f5762a Merge pull request #23719 from edx/diana/squash-tpa-migrations 
Squash third_party_auth migrations
 2020-04-23 13:11:33 -04:00
Matt Drayer
34d0166e13 Merge pull request #23798 from edx/mattdrayer/ent-3.1.3 
Upgrade edx-enterprise to 3.1.3
 2020-04-23 11:52:39 -04:00
Tim McCormack
7a406d4417 Cache site config per-request to reduce DB queries from template render (#23791) 
ARCHBOM-1139: We were seeing about 150 queries to the django_site table
and over 200 to memcached just to load the login page. A lot of these
are via mako template rendering, but there are other sources, and this
will hopefully nip it in the bud.
 2020-04-23 15:37:45 +00:00
Diana Huang
f316387cab Clean up migrations and handle manual merging. 2020-04-23 10:16:16 -04:00
Diana Huang
227df4e267 Auto-generated squashed migration. 2020-04-23 10:16:16 -04:00
Matt Drayer
66cfecbd46 Upgrade edx-enterprise to 3.1.3 2020-04-23 09:33:59 -04:00
Robert Raposa
70d09e6bf2 Add migration file for removal of logout view configuration (#23761) 
Co-authored-by: Claudiu Ion <ioncld97@gmail.com>
 2020-04-23 07:45:26 -04:00
SaadYousaf
2bc5f1b16e fixing root cause of flaky js test for discussions. 2020-04-23 16:26:32 +05:00
Awais Jibran
88ae23eb61 Merge pull request #23714 from edx/aj/add-ss-retry-to-settings 
Adds settings for celery task auto discovery
 2020-04-23 15:55:55 +05:00
edx-transifex-bot
ff51a936d5 geoip2: update maxmind geolite country database (#23792) 2020-04-23 13:48:57 +05:00
Awais Jibran
465d864c77 Adds settings for celery task auto discovery 2020-04-23 12:52:16 +05:00
stvn
ed543de5fb Merge PR #23779 courseware-api offer banner 
* Commits:
  Get upgrade offer banner HTML in courseware API
 2020-04-22 15:37:52 -07:00
stvn
0fa6099802 Get upgrade offer banner HTML in courseware API 
for use in the Learning MFE.
 2020-04-22 14:14:55 -07:00