Merge branch 'iss02'

tippy/settings.py

@@ -73,7 +73,7 @@ MEDIA_URL = '/media/'
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = '/home/martin/dev/tippy/TipPy/static/'
+STATIC_ROOT = '/home/martin/Entwicklung/tippy/TipPy/static/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
 
 # URL prefix for static files.
@@ -85,7 +85,7 @@ STATICFILES_DIRS = (
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-	'/home/martin/dev/tippy/TipPy/tippy/static',
+	'/home/martin/Entwicklung/tippy/TipPy/tippy/static',
 )
 
 # List of finder classes that know how to find static files in

tippy/urls.py

@@ -19,7 +19,6 @@ urlpatterns = patterns('',
     url(r'^accounts/', include('django.contrib.auth.urls')),
     url(r'^blog/newpost$', 'tipp.views.newBlogpost'),
     url(r'^blog/(?P<page>\d)$', 'tipp.views.blogindex'),
-    url(r'^blog/(?P<slug>[\w\-]+)', 'tipp.views.blogpost'),
 
     # Uncomment the admin/doc line below to enable admin documentation:
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),