Merge pull request #191 from ox-it/django-cors-headers

Installed and configured django-cors-headers
ox-it · Jan 9, 2015 · bc9ba55 · bc9ba55
2 parents dd584a4 + 5ac3aeb
commit bc9ba55
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -12,3 +12,4 @@ git+https://github.com/ox-it/django-webauth.git@0.4#egg=django-webauth
 python-ldap==2.4.15
 django-reversion==1.8.5
 textile==2.2.1
+django-cors-headers==1.0.0
diff --git a/talks/settings.py b/talks/settings.py
@@ -54,6 +54,9 @@
 API_OX_DATES_URL = 'https://api.m.ox.ac.uk/dates/'
 TOPICS_URL = 'https://talks-dev.oucs.ox.ac.uk/topics/'
 
+# Allow cross-origin http GET requests
+CORS_ORIGIN_ALLOW_ALL = True
+
 # Application definition
 
 INSTALLED_APPS = (
@@ -69,6 +72,7 @@
     'haystack',
     'raven.contrib.django.raven_compat',
     'reversion',
+    'corsheaders',
 
     # WebAuth
     'django_webauth',
@@ -93,6 +97,9 @@
 
     # Oxford Talks
     'talks.users.middleware.TalksUserMiddleware',
+
+    # CorsHeaders
+    'corsheaders.middleware.CorsMiddleware',
 )
 
 AUTHENTICATION_BACKENDS = (