From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 18 Sep 2015 15:00:47 +0000 (+0200)
Subject: goto django 1.8
X-Git-Tag: 1.7.0~2^2~40
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0c59303432c6e3a64cde1fb81b677f8234f87619;p=telemeta.git

goto django 1.8
---

diff --git a/examples/sandbox/settings.py b/examples/sandbox/settings.py
index a79eea62..ac51e5b6 100644
--- a/examples/sandbox/settings.py
+++ b/examples/sandbox/settings.py
@@ -150,7 +150,7 @@ INSTALLED_APPS = (
     'timeside.player',
     'timeside.server',
     'jsonrpc',
-    'south',
+    #'south',
     'sorl.thumbnail',
     'timezones',
     'jqchat',
@@ -298,4 +298,4 @@ HAYSTACK_CONNECTIONS = {
 
 HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
 
-HAYSTACK_SEARCH_RESULTS_PER_PAGE = 50
\ No newline at end of file
+HAYSTACK_SEARCH_RESULTS_PER_PAGE = 50
diff --git a/examples/sandbox/wsgi.py b/examples/sandbox/wsgi.py
index c3642fec..f35e389d 100644
--- a/examples/sandbox/wsgi.py
+++ b/examples/sandbox/wsgi.py
@@ -9,6 +9,6 @@ sys.path.append(here)
 
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 
-import django.core.handlers.wsgi
-application = django.core.handlers.wsgi.WSGIHandler()
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()
 
diff --git a/setup.py b/setup.py
index 9a02d3cf..1015887c 100644
--- a/setup.py
+++ b/setup.py
@@ -49,8 +49,8 @@ setup(
   author_email = "yomguy@parisson.com",
   version = '1.6',
   install_requires = [
-        'django==1.6.11',
-        'django-registration',
+        'django==1.8.4',
+        'django-registration-redux',
         'django-extensions',
         'django-timezones',
         'django-jqchat',
diff --git a/telemeta/locale b/telemeta/locale
index 91973b13..c5786d32 160000
--- a/telemeta/locale
+++ b/telemeta/locale
@@ -1 +1 @@
-Subproject commit 91973b13f9dc9405052727c0c525d342dee15562
+Subproject commit c5786d32a14a841469db2588092390073b8d0688
diff --git a/telemeta/models/location.py b/telemeta/models/location.py
index 6829d55b..ce3e11f6 100644
--- a/telemeta/models/location.py
+++ b/telemeta/models/location.py
@@ -205,6 +205,7 @@ class LocationRelation(ModelCore):
 class LocationForm(ModelForm):
     class Meta:
         model = Location
+        fields = '__all__'
 
     def __init__(self, *args, **kwds):
         super(LocationForm, self).__init__(*args, **kwds)