diff --git a/.gitignore b/.gitignore index 8f066de..fee43ac 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ src/ log/ stats/ +env/ node_modules/ wagtailspace/static/ wagtailspace/settings/local.py diff --git a/requirements/base.txt b/requirements/base.txt index f6fb4b5..7d286e3 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,12 +1,12 @@ ConcurrentLogHandler==0.9.1 -django-compressor==2.1 -django-crispy-forms==1.7.0 +django-compressor==2.4 +django-crispy-forms==1.11.1 django-libsass==0.7 -django-webpack-loader==0.5.0 +django-webpack-loader==0.7.0 Django==2.0.4 elasticsearch>=1.0.0,<2.0.0 libsass==0.8.3 Pillow==5.1.0 -psycopg2==2.7.1 +psycopg2==2.8.6 wagtail==2.0.1 whitenoise==3.2 diff --git a/requirements/dev.txt b/requirements/dev.txt index e5d3275..16806de 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,9 +1,9 @@ -r base.txt coverage==4.0 -django-debug-toolbar==1.9.1 +django-debug-toolbar==3.2 django-nose==1.4.4 -django_extensions==1.6.1 +django_extensions==3.1.1 fabric==1.12.0 mox==0.5.3 nose==1.3.7 diff --git a/wagtailspace/settings/base.py b/wagtailspace/settings/base.py index eac5016..048e859 100644 --- a/wagtailspace/settings/base.py +++ b/wagtailspace/settings/base.py @@ -15,6 +15,7 @@ 'modelcluster', 'compressor', 'taggit', + 'wagtail.contrib.modeladmin', 'wagtail.contrib.search_promotions', 'wagtail.contrib.forms', @@ -28,6 +29,7 @@ 'wagtail.search', 'wagtail.admin', 'wagtail.core', + 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -44,7 +46,9 @@ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'wagtail.core.middleware.SiteMiddleware', + + # 'wagtail.core.middleware.SiteMiddleware', + 'wagtail.contrib.legacy.sitemiddleware.SiteMiddleware', 'wagtail.contrib.redirects.middleware.RedirectMiddleware', ] @@ -88,7 +92,7 @@ LANGUAGE_CODE = 'en-us' -TIME_ZONE = 'Europe/Amsterdam' +TIME_ZONE = 'UTC' USE_I18N = True