Commit Graph

3253 Commits

Author SHA1 Message Date
Jeff Chaves
34634eb8e8 ENT-2885: importing ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG list from settin… (#23999)
importing ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG list from settings following same pattern that is used for CORS_ORIGIN_WHITELIST
2020-05-15 16:02:48 -04:00
Olivia Ruiz-Knott
f72a6556a9 MICROBA-311 Add US State field to UserProfile
Add list of states and field to UserProfile model; add migration; add
state field to relevant serializers and to
ACCOUNT_VISIBILITY_CONFIGURATION. Removes state data if country is
changed to something other than United States.
2020-05-12 13:55:11 -04:00
Ned Batchelder
6a23e6f641 Merge pull request #22358 from open-craft/samuel/custom-search-filter
SE-1839 Allow overriding SEARCH_FILTER_GENERATOR
2020-05-11 11:58:44 -04:00
Farhanah Sheets
d37b333d53 Revert "Add financial assistance link in course tools (#23921)"
This reverts commit cbb4cfb988.
2020-05-10 16:43:39 -04:00
Diane Kaplan
cbb4cfb988 Add financial assistance link in course tools (#23921)
Add financial assistance link in course tools for eligible courses, so it'll be more visible to learners
2020-05-08 10:35:10 -04:00
Feanil Patel
865eca0c7d This is now handled by production.py 2020-05-05 09:38:13 -04:00
Feanil Patel
b0931dd166 Move settings out of bok_choy.py to bok_choy.yml
There's more to do here but get the easy ones first and make sure we didn't break anything.
2020-05-04 16:05:53 -04:00
Feanil Patel
e15c2c5187 Remove load_test.py which we don't use anywhere. 2020-05-04 16:05:24 -04:00
Zainab Amir
c5395a2a67 Add veda fernet key to LMS (#23722) 2020-05-04 17:27:48 +05:00
Aarif
98af9ce418 remove useless-supression warnings 2020-05-01 19:42:15 +05:00
Régis Behmo
cfe311be0f Quiet deprecation warnings from imp module
The "imp" module is deprecated and should be replaced by "importlib". As
a consequence, loading the django settings used to raise deprecation
warnings:

    DeprecationWarning: the imp module is deprecated in favour of
    importlib; see the module's documentation for alternative uses

It should be noted that python 3.5.1 ships with an older release of
distutils which still relies on the imp module. Thus, users of python
3.5.1 (for instance: edx.org developers) will continue to see the
deprecation warning for some time, despite this patch. We suggest
upgrading to python 3.5.9.

This addresses part of CRI-196.
2020-04-30 23:41:40 +02: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
Feanil Patel
f5da00641b Update some really out of date docs for settings. 2020-04-24 15:33:05 -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
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
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
Albert (AJ) St. Aubin
aeef139843 Config changes to get the JWT token working with MFEs again 2020-04-21 20:20:36 -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
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
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
Ahtisham Shahid
3ce73a4166 Merge pull request #23700 from edx/ahtisham/PROD-1295
Fixed reference error in poll task
2020-04-17 18:09:40 +05:00
Jillian Vogel
865656a7d7 Makes the DCS_SESSION_COOKIE_SAMESITE_* settings configurable from the environment. 2020-04-16 13:45:12 +09:30
Kyle McCormick
18b4f50492 Rename settting PROGRAM_{MANAGER->CONSOLE}_MICROFRONTEND_URL (#23723)
Th micro-frontend was renamed.

MST-173
2020-04-15 12:06:07 -04:00
Jillian Vogel
ec69eec529 Re-add XForwardedForMiddleware 2020-04-15 11:18:57 +09:30
Ahtisham Shahid
4b02079f2c Fixed reference error in poll task 2020-04-13 17:22:35 +05:00
Awais Jibran
804fac9358 Adds retry logic for software secure 2020-04-13 14:14:11 +05:00
Jillian Vogel
285bbe849b Use DCS_* prefix for django-cookies-samesite settings
to avoid conflicts with settings in Django>2.2
2020-04-13 17:14:24 +09:30
Zachary Trabookis
7b3525278e Fix SameSite cookie issue for LTI Provider. EW-449
There was an issue where external LMS system (e.g. Canvas, Blackboard) that used Open edX LTI Provider calls had cookies blocked. This update fixes this issue by defining third-party cookies to have attributes of `Secure=True` and `SameSite=None`.

Details here: https://discuss.openedx.org/t/lti-xblock-and-samesite/759/5

(cherry picked from commit 28479a2966b87b16a25dbc96c19b6f5817d255de)
2020-04-13 17:14:15 +09:30
Jillian Vogel
bb85420e91 Adds django-cookies-sameseite middleware
and settings to set SameSite=None for all secure cookies.
2020-04-13 17:14:07 +09:30
Diana Huang
34ea9124c3 Merge pull request #23628 from danialmalik/danial/merge-devstack-docker-with-devstack
Merge all configs of devstack_docker.py into devstack.py
2020-04-10 11:30:35 -04:00
Feanil Patel
1b63f401b9 Merge pull request #23052 from edx/feanil/production_py_autoload
Auto load any keys/values from the yaml config file.
2020-04-10 09:34:37 -04:00
danialmalik
164c165e1a Merge all configs of devstack_docker.py into devstack.py 2020-04-10 11:36:17 +05:00
M Zulqarnain
093bc8d2f3 Remove port range for liveserver test (#23672) 2020-04-10 00:59:34 +05:00
Feanil Patel
bf320f038b Find more vars that are partially updated. 2020-04-09 15:27:28 -04:00
Feanil Patel
75f663791e Account for dicts that don't get replaced wholesale.
Right now we have a few settings that are not whoesale replaced but
piecemeal updated. So we remove them from the mass update.
2020-04-09 15:27:28 -04:00
Feanil Patel
7c0c71ca69 Auto load any keys/values from the yaml config file.
This should allow us to remove all the boilerplate code in this file
where a name is pulled from the config dict and put into the top level
namespace of the settings module.

We do this first so that any logic that adds more complex or dynamic
keys will still run and is safe.

Now that this is here we can start removing any simple boilerplate.
2020-04-09 15:27:28 -04:00
Zia Fazal
f2f8d8519a Merge pull request #23658 from edx/ziafazal/ENT-2709
ENT-2709:Map first name to edx username by default oauth SSO
2020-04-09 09:56:56 +05:00
zia.fazal@arbisoft.com
cd60f6c973 Map first name to edx username by default oauth SSO
Change to map first name to edx username by default oauth SSO with `identityserver3` backend
ENT-2709

Addressed reviewer's feedback
2020-04-08 19:26:24 +05:00
adeelehsan
02d24fdb63 Refund text updated.
PROD-1418
2020-04-08 19:12:54 +05:00
Zaman Afzal
c7e2f8d49a ENT-2651 Recovery email Field UX logic on Account Settings page was not same to dashboard (#23565) 2020-04-08 16:21:37 +05:00
Waheed Ahmed
3dc3e10819 Revert "Adds retry logic for software secure." 2020-04-07 20:40:06 +05:00
Awais Jibran
4b22554411 Merge pull request #23514 from edx/aj/ss-retry-logic
Adds retry logic for software secure.
2020-04-07 10:59:57 +05:00
Thomas Tracy
09d814f7fd Add link to coaching interstitial for MB students who have not signed up for coaching (#23492) 2020-04-06 10:35:45 -04:00
Awais Jibran
4ead215665 Adds retry logic for ss.
1. Created a new celery queue with key `SOFTWARE_SECURE_VERIFICATION_ROUTING_KEY`.
2. Added a celery task with retry logic.
3. sorted imports with isort.
4. Changed deprecated `log.warn` => `log.warning`.
2020-04-06 15:16:56 +05:00
Danial Malik
8d951ae8ae Import private.py in devstack_docker.py files instead of devstack.py (#23512)
Background: I use private.py a lot in my devstack for my private configurations. But issues are raised when I need to change/override a setting that is defined in devstack_docker.py file. Since that file's contents are loaded after private.py, my private.py is useless against the settings in devstack_docker.py.

Description: Now that the devstack is dockerized, I think it makes more sense to import the private.py in the devstack_docker.py files i.e. at the end of configuration files hierarchy.
2020-03-30 09:38:25 -04:00
Nick
f37c860c87 Merge pull request #23448 from edx/ndalfonso/AA-38-calendar-sync-email-template
AA-38 calendar sync email template
2020-03-26 08:51:53 -04:00
Nicholas D'Alfonso
52309d5541 AA-38 calendar sync email template
- create templates and methods to build/send calendar sync emails.
2020-03-25 16:40:19 -04:00
Calen Pennington
5551ef08bf Revert "Revert "Upgrade edx-when to read XBlock dates out of the read-replica"" 2020-03-25 14:29:48 -04:00
Calen Pennington
c8fcab315e Revert "Upgrade edx-when to read XBlock dates out of the read-replica" 2020-03-24 16:30:50 -04:00