Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrades

Browse source
This commit is contained in:
Patrick Altman 2016-02-27 16:55:59 -06:00
parent c27be5e4c7
commit 0b1da0e85e
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pinaxcon/urls.py
View file

@ -8,8 +8,7 @@ from django.contrib import admin
import symposion.views import symposion.views
urlpatterns = patterns( urlpatterns = [
"",
url(r"^$", TemplateView.as_view(template_name="homepage.html"), name="home"), url(r"^$", TemplateView.as_view(template_name="homepage.html"), name="home"),
url(r"^admin/", include(admin.site.urls)), url(r"^admin/", include(admin.site.urls)),
@ -27,6 +26,6 @@ urlpatterns = patterns(
url(r"^boxes/", include("pinax.boxes.urls")), url(r"^boxes/", include("pinax.boxes.urls")),
url(r"^", include("pinax.pages.urls")), url(r"^", include("pinax.pages.urls")),
) ]
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

19
requirements.txt
View file

@ -1,15 +1,14 @@
Django==1.8.5 Django==1.9.2
pinax-theme-bootstrap==7.1.1 pinax-theme-bootstrap==7.3.0
django-user-accounts==1.2 django-user-accounts==1.3.1
metron==1.3.5 metron==1.3.7
pinax-eventlog==1.0.0 pinax-eventlog==1.1.1
django-jsonfield==0.9.15
dj-static==0.0.6 dj-static==0.0.6
dj-database-url==0.3.0 dj-database-url==0.4.0
gunicorn==19.3.0 gunicorn==19.4.5
psycopg2==2.6.1 psycopg2==2.6.1
pinax-pages==0.3.1 pinax-pages==0.4.2
pinax-boxes==2.1.0 pinax-boxes==2.1.2
# run off of master for now # run off of master for now
git+https://github.com/pinax/symposion.git git+https://github.com/pinax/symposion.git