diff options
Diffstat (limited to 'gstudio')
| -rw-r--r-- | gstudio/templates/gstudio/skeleton.html | 1 | ||||
| -rw-r--r-- | gstudio/urls/__init__.py | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html index 5820701..8f5c30d 100644 --- a/gstudio/templates/gstudio/skeleton.html +++ b/gstudio/templates/gstudio/skeleton.html @@ -415,7 +415,6 @@ function load(key) } fill = d3.scale.category20(); ->>>>>>> 184877f00ded7fe61420111de4ec8d48d3bee634 var vis = d3.select("#chart") .append("svg:svg") .attr("id", "amazingViz") diff --git a/gstudio/urls/__init__.py b/gstudio/urls/__init__.py index 6d8716a..d9f65cd 100644 --- a/gstudio/urls/__init__.py +++ b/gstudio/urls/__init__.py @@ -38,13 +38,10 @@ urlpatterns = patterns( url(r'^', include('gstudio.urls.quick_nodetype')), url(r'^', include('gstudio.urls.capabilities')), url(r'^', include('gstudio.urls.nodetypes')), -url(r'^', include('gstudio.urls.Chat')), -url(r'^Chatroom/', include('gstudio.urls.chat')), -url(r'^Chatroom/topicadd/', include('gstudio.urls.topicadd')), -url(r'topicadd1/', include('gstudio.urls.topicadd1')), -url(r'^login', include('gstudio.urls.login')), + url(r'topicadd1/', include('gstudio.urls.topicadd1')), + url(r'^login', include('gstudio.urls.login')), url(r'user/(\w+)/$','gstudio.views.user.userdashboard'), - url(r'groupadd/', include('gstudio.urls.groupadd')), + url(r'groupadd/', include('gstudio.urls.groupadd')), url(r'group/',include('gstudio.urls.group')), url(r'^resources/images/',include('gstudio.urls.image')), url(r'^resources/videos/',include('gstudio.urls.video')), |