Skip to content
Snippets Groups Projects
Commit 80cc66f1 authored by Branson Craig Stephens's avatar Branson Craig Stephens
Browse files

Merge branch 'cleanup' into guardian

parents a8dcc628 f726c006
No related branches found
No related tags found
No related merge requests found
......@@ -8,7 +8,7 @@ from django.conf.urls import patterns, url, include
from gracedb.api import download
urlpatterns = patterns('gracedb.views',
url (r'^$', 'index', name="home"),
url (r'^$', 'index', name="home-events"),
url (r'^create/$', 'create', name="create"),
url (r'^search/(?P<format>(json|flex))?$', 'search', name="search"),
url (r'^view/(?P<graceid>[GEHT]\d+)', 'view', name="view"),
......
......@@ -17,8 +17,8 @@ feeds = {
urlpatterns = patterns('',
url (r'^$', 'gracedb.views.index', name="home"),
url (r'^SPInfo/', 'gracedb.views.spinfo', name="spinfo"),
url (r'^SPPrivacy/', 'gracedb.views.spprivacy', name="spprivacy"),
url (r'^SPInfo', 'gracedb.views.spinfo', name="spinfo"),
url (r'^SPPrivacy', 'gracedb.views.spprivacy', name="spprivacy"),
(r'^events/', include('gracedb.urls')),
(r'^api/', include('gracedb.urls_rest', app_name="api", namespace="x509")),
(r'^apiweb/', include('gracedb.urls_rest', app_name="api", namespace="shib")),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment