]> git.parisson.com Git - telemeta.git/commitdiff
goto django 1.8
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 18 Sep 2015 15:00:47 +0000 (17:00 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 18 Sep 2015 15:00:47 +0000 (17:00 +0200)
examples/sandbox/settings.py
examples/sandbox/wsgi.py
setup.py
telemeta/locale
telemeta/models/location.py

index a79eea626c31e100ea6af4723e94cefc4dce201a..ac51e5b618b75aa1cabc616cb3d29257ee390eae 100644 (file)
@@ -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
index c3642fec137b441b2f8af1dffac18149cfe6f38f..f35e389d8ba914c693260f3b8ee0fd1894d376bd 100644 (file)
@@ -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()
 
index 9a02d3cff0035e99b51ca6eda319dc60d3443cc9..1015887cabf57141ffc02618000073cef7242899 100644 (file)
--- 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',
index 91973b13f9dc9405052727c0c525d342dee15562..c5786d32a14a841469db2588092390073b8d0688 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 91973b13f9dc9405052727c0c525d342dee15562
+Subproject commit c5786d32a14a841469db2588092390073b8d0688
index 6829d55b7fa4b75c54007ed63749e824f30ed9da..ce3e11f616902265f80b9c70323f90434574ab5c 100644 (file)
@@ -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)