Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,645 Commits 1 Branch 0 Tags
11a9a4e47134f4df5ac7a2eca355ed4f7342d718
Commit Graph

53645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff LaJoie
11a9a4e471 AA-51: Adds in 'Up next' banner to course home 2020-03-16 15:50:19 -04:00
Awais Jibran
d95e8724d8 Merge pull request #23342 from edx/aj/disable-forums-digests 
(story): Add switch to disable forum digest in prod.
 2020-03-16 20:49:07 +05:00
Michael Terry
d7381708de Merge pull request #23404 from edx/mikix/icalendar 
Add func to generate ics for schedule
 2020-03-16 11:31:32 -04:00
Cory Lee
43b3a2004c Readd historical schedule fks (#23414) 
* Readd historical schedule fks
 2020-03-16 11:22:17 -04:00
adeelehsan
9608528cb3 Merge pull request #23395 from edx/aehsan/prod-1361/command_for_account_recovery 
Command added to recover learner accounts
 2020-03-16 19:59:28 +05:00
Michael Terry
4c241e57fe Add func to generate ics for schedule 
This is an unused-as-of-yet utility function to generate a bunch
of ics files for a user's course schedule. Will be used as part
of the calendar_sync feature package.

AA-37
 2020-03-16 10:51:51 -04:00
adeelehsan
c0f9053ddb Command added to recover accounts 
PROD-1361
 2020-03-16 19:23:26 +05:00
Manjinder Singh
bcff9dbde3 Remove shortuuid from req and ran make upgrade (#23397) 2020-03-16 09:15:41 -04:00
Awais Qureshi
702a626649 Merge pull request #23379 from edx/awais786/BOM-1399 
BOM-1399
 2020-03-16 15:33:55 +05:00
Awais Qureshi
0f002bafb8 BOM-1399 
checking django-wiki and fixing deprecation warnings.
 2020-03-16 14:37:18 +05:00
Hammad Ahmad Waqas
f692739da3 Merge pull request #23191 from edx/hammad/ENT-2580 
ENT-2580 | added management command to push old enrollments to ecommerce
 2020-03-16 12:55:38 +05:00
edX cache uploader bot
747cdd1ecb Updating Bokchoy testing database cache (#23401) 2020-03-13 15:36:19 -04:00
Awais Jibran
ac0779f0ff Merge pull request #23402 from edx/logs-cleanup 
Handle deprecation warn by importing right class.
 2020-03-13 23:55:08 +05:00
Zachary Hancock
2325b3af7a history on bulk create of enrollments (#23389) 
fixes bug where bulk creation of enrollments caused no new history records to be created
 2020-03-13 12:55:58 -04:00
Awais Jibran
65094cbf35 Handle deprecation warn by importing right class. 
2900k/ last 7 days
 2020-03-13 21:50:40 +05:00
Brittney Exline
65cd6c5899 Merge pull request #23400 from edx/bexline/upgrade_edx_enterprise 
Version upgrade for edx-enterprise
 2020-03-13 09:47:53 -06:00
Simon Chen
b34af45393 MST-157 Create a new program enrollments inspector support tool to help edX support members to inspect the existing states of program enrollees 
This reverts commit 37f3c3f829.
 2020-03-13 11:28:16 -04:00
Simon Chen
a47f4d7570 Fix flaky test in Catalog Integration Configuration Model 2020-03-13 11:28:03 -04:00
Michael Terry
2d845385e9 Merge pull request #23399 from edx/mikix/update-subquery 
Avoid subquery on table being updated
 2020-03-13 11:21:07 -04:00
Brittney Exline
59f0691ea1 Version upgrade for edx-enterprise 2020-03-13 09:19:09 -06:00
Albert (AJ) St. Aubin
cfca8ef90d Merge pull request #23308 from edx/aj/MICROBA-152 
Aj/microba 152
 2020-03-13 10:55:32 -04:00
Michael Terry
3775fb1d9e Avoid subquery on table being updated 
MySQL doesn't like you subquerying on the same table you are trying
to update in one query.

https://dev.mysql.com/doc/refman/8.0/en/subquery-restrictions.html

PROD-1366
 2020-03-13 10:53:23 -04:00
Albert (AJ) St. Aubin
a5ec801a2a Add an Admin page view to add External IDs for Users in bulk 
[MICROBA-152]
 2020-03-13 10:20:24 -04:00
Cory Lee
22bd5cccae Dropping start from historicalschedule (#23390) 2020-03-13 09:53:43 -04:00
Nick
18e3c2fd52 Merge pull request #23373 from edx/AA-59-reset-dates-banner-on-courseware 
AA-59 show reset dates banner on courseware page
 2020-03-13 08:14:00 -04:00
edX requirements bot
9d2647eaa4 Updating Python Requirements (#23396) 2020-03-13 08:08:54 -04:00
Nicholas D'Alfonso
3cee26feb4 AA-59 show reset dates banner on courseware page 
- Also, only show banner if the course end_date has not already
  pass AND if the user is verified within the course.
 2020-03-12 19:52:54 -04:00
David Ormsbee
54e1f483cb Merge pull request #23391 from edx/revert-23320-schen/program_support 
Revert "MST-157 Create a new program enrollments inspector support tool Part 1"
 2020-03-12 17:56:47 -04:00
David Ormsbee
37f3c3f829 Revert "MST-157 Create a new program enrollments inspector support tool to help edX support members to inspect the existing states of program enrollees" 
This reverts commit 9bdcb9c5f5.
 2020-03-12 17:28:58 -04:00
Simon Chen
9bdcb9c5f5 MST-157 Create a new program enrollments inspector support tool to help edX support members to inspect the existing states of program enrollees 2020-03-12 15:47:26 -04:00
Abdul Hannan
fa6633ba4e DO NOT MERGE - NEED FAKE - Rename start in schedule 5/5 (#22392) 
* Remove start field in Schedules

Co-authored-by: hunytalk <ahannan@edx.org>
Co-authored-by: Cory Lee <cory@edx.org>
 2020-03-12 15:40:19 -04:00
David Ormsbee
c988456f0c Merge pull request #23386 from edx/revert-23241-blockstore-runtime-bug-fix 
Revert "Fix Blockstore XBlock Runtime's handling of occasional S3 errors"
 2020-03-12 15:29:08 -04:00
David Ormsbee
09c5432415 Revert "Fix Blockstore XBlock Runtime's handling of occasional S3 errors" 2020-03-12 15:09:23 -04:00
Robert Raposa
d15402db8d Merge pull request #23378 from edx/robrap/ARCHBOM-952-openedx-calc 
ARCHBOM-952: make upgrade + openedx-calc from PyPI
 2020-03-12 13:29:26 -04:00
edX cache uploader bot
c5db2b2cce Updating Bokchoy testing database cache (#23382) 2020-03-12 13:10:02 -04:00
Diana Huang
df8ce3277f Merge pull request #23383 from edx/diana/unpin-supercsv 
Unpin super-csv and allow it to be upgraded.
 2020-03-12 12:15:17 -04:00
Diana Huang
f7bb188106 Unpin super-csv and allow it to be upgraded. 2020-03-12 11:39:18 -04:00
Jeremy Bowman
46631dfcba Upgrade django-babel-underscore BOM-1069 (#23257) 
We upgraded these before in https://github.com/edx/edx-platform/pull/23119 along with django-countries (which released a new version just before that), but had to revert in https://github.com/edx/edx-platform/pull/23237 because of a performance regression in the admin page for EnterpriseCustomer.  We think django-countries was the culprit and have pinned it, so trying these two again by themselves.
 2020-03-12 11:15:12 -04:00
Dillon Dumesnil
c3493d5138 Merge pull request #23356 from edx/ddumesnil/AA-58 
AA-58: Add date-summary-container html back in
 2020-03-12 10:51:04 -04:00
David Ormsbee
22af9ff545 Merge pull request #23241 from open-craft/blockstore-runtime-bug-fix 
Fix Blockstore XBlock Runtime's handling of occasional S3 errors
 2020-03-12 09:17:09 -04:00
Feanil Patel
aec6e6551b Merge pull request #23381 from edx/jenkins/upgrade-python-requirements-ee8c8a1 
Python Requirements Update
 2020-03-12 08:35:09 -04:00
Awais Jibran
ebd6494af2 Merge pull request #23380 from edx/logs-cleanup 
Remove unnecessary logs.
 2020-03-12 16:38:54 +05:00
edX requirements bot
35cd0f7171 Updating Python Requirements 2020-03-12 06:47:27 -04:00
Nadeem Shahzad
ee8c8a18d3 Merge pull request #23374 from edx/nadeem/DOS-678 
add tags to pytest xdist worker (DOS-678)
 2020-03-12 15:37:47 +05:00
Awais Jibran
084b409662 Unnecessary logs. 2020-03-12 15:15:22 +05:00
Awais Jibran
6a25ca800b ~200k instances in last 7 days. 2020-03-12 14:22:52 +05:00
Zainab Amir
ed25521f61 Enable testing pipeline for video uploads to s3 (#23375) 
Add integration settings to enable upload of videos from from studio.
Settings enable user to connect to s3 bucket using mfa and assume role
functionality.

PROD-1214
 2020-03-12 12:19:52 +05:00
Robert Raposa
8704289ad9 make upgrade + openedx-calc from PyPI 
- switches to openedx-calc from PyPI
- includes edx-rest-api-client major upgrade.

ARCHBOM-952
 2020-03-11 21:00:01 -04:00
Nathan Sprenkle
5578cca1cc Show multiple team memberships in My Team tab (#23324) 
* Enable pagiation to show all a learner's teams on the "My Teams" tab
* Selectively hide/show pagination on the "My Teams" tab
* Increase "My Teams" page size to 5
 2020-03-11 15:05:15 -04:00
Braden MacDonald
8b9594e7dd Improve caching of blockstore data 
This includes an optimization to the get_bundle_version_files_cached method, which is used very often when loading blockstore data; it was previously being cached only in a process-local cache (lru_cache). My hunch is that in production, with many appservers and LMS workers and frequent deployments and a large number of bundles, the process-local cache is not being hit very often.

I also increased the MAX_BLOCKSTORE_CACHE_DELAY from 60s to 300s; this reduces the frequency with which we check if either (A) an external system modified the blockstore bundle and/or (B) we have a cache invalidation bug somewhere. I am increasing it because that check is more expensive than I thought (calling blockstore API to ascertain latest version of a particular bundle), and I haven't seen any cache invalidation errors that this would help to work around. (Plus, increasing this will make such bugs more obvious.)
 2020-03-11 11:15:59 -07:00