diff options
Diffstat (limited to 'scannerjammer/urls.py')
| -rw-r--r-- | scannerjammer/urls.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scannerjammer/urls.py b/scannerjammer/urls.py index 1b3648d..2ff8064 100644 --- a/scannerjammer/urls.py +++ b/scannerjammer/urls.py @@ -12,10 +12,10 @@ urlpatterns = patterns('', url(r'^$', 'frontend.views.roomlist', name='roomlist'), # Uncomment the admin/doc line below to enable admin documentation: - url(r'^admin/doc/', include('django.contrib.admindocs.urls')), + url(r'^django-admin/doc/', include('django.contrib.admindocs.urls')), # Uncomment the next line to enable the admin: - url(r'^admin/', include(admin.site.urls)), + url(r'^django-admin/', include(admin.site.urls)), # Backend url(r'^api/', include('backend.urls')), @@ -26,6 +26,8 @@ urlpatterns = patterns('', url(r'^directory/?$', 'frontend.views.directory', name='directory'), url(r'^faq/?$', 'frontend.views.faq', name='faq'), url(r'^calendar/?$', 'frontend.views.calendar', name='calendar'), + url(r'^register/?$', 'frontend.views.register', name='register'), + url(r'^admin/?$', 'frontend.views.admin', name='admin'), url(r'^profile/(?P<username>[a-z0-9_]+)$', 'frontend.views.profile', name='profile'), url(r'^(?P<roomname>avatar)/$', 'frontend.views.room', name='room'), url(r'^(?P<roomname>[a-z0-9_]+)$', 'frontend.views.room', name='room'), |