Commit 079ee464 authored by Troy Grandy's avatar Troy Grandy

Merge branch 'master' of git.uwaterloo.ca:science-computing/Scinage

parents 9a1d6d52 9ad006c4
......@@ -9,23 +9,23 @@ django-cas-ng==3.6.0
django-codemirror-widget==0.5.0
django-compressor==2.4
django-crispy-forms==1.8.1
django-filter==2.2.0
django-filter==2.4.*
django-haystack==2.8.1
django-imagekit==4.0.2
django-sass-processor==0.8
django-taggit==1.1.0
djangorestframework==3.10.3
djangorestframework==3.11.*
future==0.18.2
idna==2.8
Jinja2==2.10.3
libsass==0.19.4
lxml==4.4.1
lxml==4.6.*
MarkupSafe==1.1.1
oauthlib==3.1.0
pdf2image==1.11.0
pefile==2019.4.18
pilkit==2.0
Pillow==6.2.1
Pillow==8.0.*
PyJWT==1.7.1
PySocks==1.7.1
python-cas==1.4.0
......@@ -38,5 +38,5 @@ rjsmin==1.1.0
six==1.13.0
sqlparse==0.3.0
tweepy==3.8.0
urllib3==1.25.7
urllib3==1.25.*
Whoosh==2.7.4
......@@ -25,7 +25,7 @@ from layers.api import *
#Register api paths
router = routers.SimpleRouter()
router.register(r'layer', LayerAPIViewset, base_name='layer')
router.register(r'layer', LayerAPIViewset, basename='layer')
handler404 = layers.views.handler404
......
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