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

54159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Saad Yousaf
9b469f6d03 Merge pull request #23769 from edx/saad/PROD-1440-update-done-xblock 
[PROD-1440] - Update Done xblock to latest version.
 2020-04-21 16:33:27 +05:00
AsadAzam
db7ddf10f2 Merge pull request #23768 from edx/asad/prod-1394-fix 
Fixed error message check on 403
 2020-04-21 14:18:47 +05:00
Alex Dusenbery
f40bb34ce7 For course grade and problem grade reports, clear course enrollment caches after each batch of users is processed. 2020-04-20 14:19:54 -04:00
George Babey
5d62456250 Merge pull request #23671 from open-craft/jill/samesite-cookies 
SE-2320 Adds django-cookies-sameseite middleware
 2020-04-20 13:15:26 -04:00
SaadYousaf
5236116db1 update Done xblock to latest version. 2020-04-20 18:02:58 +05:00
asadazam93
b0cb5bb1e7 Fixed error message check on 403 2020-04-20 16:17:25 +05:00
Ali Akbar
3acacb2cb8 Merge pull request #23718 from edx/aakbar/course_update_items_fix 
add improved re-write for course updates
 2020-04-20 15:55:45 +05:00
Calen Pennington
fc60f7b9c0 Merge pull request #23746 from cpennington/pre-load-html-for-static-tabs 
Load XBlockToXModuleShim for Studio Tabs page
 2020-04-20 06:34:55 -04:00
Ali-D-Akbar
d959a01778 add improved re-write for course updates 
add improved re-write for course updates

add improved re-write for course updates

add edge case test for course update re-write

add edge case test for course update re-write

add edge case test for course update re-write

add edge case test for course update re-write

add edge case test for course update re-write
 2020-04-20 15:09:28 +05:00
zia.fazal@arbisoft.com
f70390d70f Added more info to log in SSO request/response flow 
Added more info to log in SSO request/response flow
Fixed django admin links on model's link fields which are broken due to django 2.2 upgrade.
ENT-2798

Fixed quality violations and unit test

Fix xsscommitlint violation

Fixed pylint violation
 2020-04-20 14:38:51 +05:00
Hammad Ahmad Waqas
449b6d0189 Merge pull request #23765 from edx/hammad/ENT-2724 
ENT-2724 | refactored imports from edx-django-utils
 2020-04-20 13:47:59 +05:00
HammadAhmadWaqas
11893ad69e refactored imports from edx-django-utils 2020-04-20 12:11:28 +05:00
edX Transifex Bot
e876286364 fix(i18n): update translations 2020-04-19 17:19:13 -04:00
Michael Roytman
bf713570d5 Merge pull request #23720 from edx/mroytman/MST-184-enrollments-linking-course-staff 
Realize CourseAccessRoles for a user when an LMS user is linked to th…
 2020-04-18 10:42:54 -04:00
Michael Roytman
316e76f7e9 realize CourseAccessRoles for a user when an LMS user is linked to their external_user_key 2020-04-17 18:16:58 -04:00
Kyle McCormick
29932a986e Add APIView for ID verification status (#23760) 
For Hackathon XXIV IDv page overhaul.
 2020-04-17 17:20:29 -04:00
Feanil Patel
791666fb7e Remove redundant settings. 
Now that we autoload most keys directly from the yaml file into the
settings context.  We don't need boilerplate of the form:

KEY = ENV_TOKENS.get('KEY', KEY)
KEY = AUTH_TOKENS.get('KEY', KEY)

which tries to get the value of KEY from the config file but if it's not
there it pulls it from the defaults found in common.py
 2020-04-17 15:55:12 -04:00
Farhanah Sheets
7feddd3afa Log update 2020-04-17 15:34:10 -04:00
Farhanah Sheets
8f909e0b35 Attempting to add more logging 2020-04-17 15:18:34 -04:00
Nick
03ea899f35 Merge pull request #23758 from edx/ndalfonso/prod-1481-contact-hr 
PROD-1841 contact hr
 2020-04-17 15:16:02 -04:00
Nicholas D'Alfonso
12eac14aa0 PROD-1841 contact hr 
- add horizontal rule to contact us page
 2020-04-17 14:41:17 -04:00