Merge branch 'Roussille/bda' into 'master'

autorisation des requêtes cross-domain

See merge request cof-geek/gestioCOF!253
This commit is contained in:
Martin Pepin 2018-04-08 22:43:30 +02:00
commit 6c983e16e5
2 changed files with 10 additions and 0 deletions

View file

@ -104,9 +104,11 @@ INSTALLED_APPS = [
'taggit',
'kfet.auth',
'kfet.cms',
'corsheaders',
]
MIDDLEWARE = [
'corsheaders.middleware.CorsMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
@ -208,6 +210,13 @@ AUTHENTICATION_BACKENDS = (
RECAPTCHA_USE_SSL = True
CORS_ORIGIN_WHITELIST = (
'bda.ens.fr',
'www.bda.ens.fr'
'cof.ens.fr',
'www.cof.ens.fr',
)
# Cache settings
CACHES = {

View file

@ -24,6 +24,7 @@ channels==1.1.5
python-dateutil
wagtail==1.10.*
wagtailmenus==2.2.*
django-cors-headers==2.2.0
# Production tools
wheel