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

54180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Feanil Patel
d78a5a6f65 Merge pull request #23787 from edx/feanil/dont_override_email_backend 
Don't explicitly set the email backend in production.py
 2020-04-22 13:26:05 -04:00
Luis Moreno
3d8875d505 Fix docstring of retrieve_last_sitewide_block_completed 2020-04-22 12:45:22 -04:00
Feanil Patel
db4fd4525e Don't explicitly set the email backend in production.py 
We shouldn't be explicitly setting this here. It's already set in all of
our override files and not everyone who wants to use production.py wants
to use SES so we shouldn't hardcode it here.

Also move the other settings to above the config loading so that all
config can be overridden by the config file.
 2020-04-22 11:20:46 -04:00
Robert Raposa
4e6248066a fix student squash migrations (#23783) 
There was a missing migration from the original squash.
 2020-04-22 10:01:31 -04:00
edX requirements bot
fa511f6f29 Updating Python Requirements (#23782) 2020-04-22 13:49:12 +00:00
edX Transifex Bot
4f1979dfd4 fix(i18n): update translations 2020-04-22 09:17:11 -04:00
Albert (AJ) St. Aubin
5e3a5d8bb8 Merge pull request #23753 from edx/aj/jwt_issuer 
Config changes to get the JWT token working with MFEs again
 2020-04-22 08:10:23 -04:00
edX Transifex Bot
960ba3fe4d fix(i18n): update translations 2020-04-22 04:36:16 -04:00
Zainab Amir
f10adf5e6a Add new transcription status (#23766) 
Added new transcription status to represent *partial failure*,
meaning some jobs failed while others passed

PROD-1486
 2020-04-22 13:08:47 +05:00
adeel khan
d8cd19e099 Merge pull request #23770 from edx/adeel/prod_1438_fix_fa_page 
Fixes translations for financial assistance page
 2020-04-22 12:42:31 +05:00
Albert (AJ) St. Aubin
aeef139843 Config changes to get the JWT token working with MFEs again 2020-04-21 20:20:36 -04:00
Diana Huang
bfc76483cc Merge pull request #23715 from edx/diana/squash-student-migrations 
Squashing migrations in the `student` djangoapp.
 2020-04-21 16:07:34 -04:00
Diana Huang
fa8acfff89 Fix issues related to the auto-generated migration. 2020-04-21 14:15:39 -04:00
Diana Huang
b93f7b529f Add generated migration file. 2020-04-21 14:14:54 -04:00
Feanil Patel
5233fd3bc5 Merge pull request #23756 from edx/feanil/remove_redundant_loading 
Remove redundant settings.
 2020-04-21 14:11:53 -04:00
Michael Terry
d8282f0abb Merge pull request #23775 from edx/mikix/edx-when-1.2.1 
requirements: bump edx-when to 1.2.1
 2020-04-21 13:58:11 -04:00
Michael Terry
41629c5bac requirements: bump edx-when to 1.2.1 
This adds a missing migration file to change the plural name of a
model.
 2020-04-21 13:37:25 -04:00
edX requirements bot
4f7de2c5f7 Updating Python Requirements (#23772) 2020-04-21 16:59:50 +00:00
Farhanah Sheets
d189f0d854 Merge pull request #23755 from edx/julianajlk/PROD-1480/contactus-alert-banner 
Add alert banner to Contact Us Page
 2020-04-21 10:54:12 -04:00
Farhanah Sheets
d229240363 Merge pull request #23752 from edx/julianajlk/PROD-1482/change-cta 
Update CTA text for Contact Us Page
 2020-04-21 10:53:27 -04:00
Farhanah Sheets
602ebfaf1c Merge pull request #23757 from edx/fsheets/contact-us-hackathon-2 
Update wording for clarity and bug fix for API expectations
 2020-04-21 10:49:44 -04:00
Adeel Khan
67ec1d703c Fixes translations for financial assistance page 
PROD-1438
 2020-04-21 17:16:48 +05:00
Zia Fazal
24c0fb2875 Merge pull request #23764 from edx/ziafazal/ENT-2798 
ENT-2798: Added more info to log in SSO request/response flow
 2020-04-21 16:57:31 +05:00