diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index a0d90904f93512efcf6ccbefacf4a4ce8b99a4b1..679742847dbac9659ee938d4387bd15e30de9bec 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -8,8 +8,7 @@ from django.contrib import admin import symposion.views -urlpatterns = patterns( - "", +urlpatterns = [ url(r"^$", TemplateView.as_view(template_name="homepage.html"), name="home"), url(r"^admin/", include(admin.site.urls)), @@ -27,6 +26,6 @@ urlpatterns = patterns( url(r"^boxes/", include("pinax.boxes.urls")), url(r"^", include("pinax.pages.urls")), -) +] urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/requirements.txt b/requirements.txt index 41c1b196cb1dbaf485bc1d0098ea965326645078..89d29871e38546af895819f26e6b09b8027fbf8a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,14 @@ -Django==1.8.5 -pinax-theme-bootstrap==7.1.1 -django-user-accounts==1.2 -metron==1.3.5 -pinax-eventlog==1.0.0 -django-jsonfield==0.9.15 +Django==1.9.2 +pinax-theme-bootstrap==7.3.0 +django-user-accounts==1.3.1 +metron==1.3.7 +pinax-eventlog==1.1.1 dj-static==0.0.6 -dj-database-url==0.3.0 -gunicorn==19.3.0 +dj-database-url==0.4.0 +gunicorn==19.4.5 psycopg2==2.6.1 -pinax-pages==0.3.1 -pinax-boxes==2.1.0 +pinax-pages==0.4.2 +pinax-boxes==2.1.2 # run off of master for now git+https://github.com/pinax/symposion.git