Commit d37b449e authored by Malcolm Dinsmore's avatar Malcolm Dinsmore

Update to django version 1.10

parent 6a068a94
# -*- encoding: utf-8 -*-
from django.conf.urls import (
patterns,
url,
)
from django.conf.urls import url
from .views import (
BookingDeleteView,
......@@ -28,8 +25,7 @@ from .views import (
)
urlpatterns = patterns(
'',
urlpatterns = [
url(regex=r'^$',
view=BookingListView.as_view(),
name='booking.list'
......@@ -110,4 +106,4 @@ urlpatterns = patterns(
view=RotaTypeUpdateView.as_view(),
name='booking.rota.type.update'
),
)
]
......@@ -124,7 +124,6 @@ DJANGO_APPS = (
)
THIRD_PARTY_APPS = (
'compressor',
'easy_thumbnails',
'reversion',
)
......
# -*- encoding: utf-8 -*-
from django.conf import settings
from django.conf.urls import patterns, include, url
from django.conf.urls import include, url
from django.conf.urls.static import static
from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
......@@ -24,8 +24,7 @@ from .views import (
admin.autodiscover()
urlpatterns = patterns(
'',
urlpatterns = [
url(regex=r'^$',
view=HomeView.as_view(),
name='project.home'
......@@ -63,7 +62,7 @@ urlpatterns = patterns(
view=SettingsView.as_view(),
name='project.settings'
),
)
]
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
# ^ helper function to return a URL pattern for serving files in debug mode.
......
bleach==1.4.2
celery==3.1.19
django-braces==1.8.1
django-compressor==2.0
bleach==1.4.3
celery==3.1.23
django-braces==1.9.0
django-redis==4.4.3
django-reversion==2.0.5
django-sendfile==0.3.9
Django==1.9.7
django-reversion==2.0.6
django-sendfile==0.3.11
Django==1.10.3
easy-thumbnails==2.3
pillow==3.2.0
python-dateutil==2.4.2
pytz==2016.3
pillow==3.3.1
python-dateutil==2.5.3
pytz==2016.6.1
redis==2.10.5
reportlab==3.3.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment