X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/4c48c47d0b84e516114c16ee191359166e93a51c..60fb768e247f66ddd18b8cac2101fdc3996ba67b:/redakcja/urls.py?ds=sidebyside diff --git a/redakcja/urls.py b/redakcja/urls.py index 1d76ee80..2343b05d 100644 --- a/redakcja/urls.py +++ b/redakcja/urls.py @@ -9,8 +9,11 @@ admin.autodiscover() urlpatterns = patterns('', # Auth - url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'), - url(r'^accounts/logout/$', 'catalogue.views.logout_then_redirect', name='logout'), + #url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'), + #url(r'^accounts/logout/$', 'catalogue.views.logout_then_redirect', name='logout'), + + url(r'^accounts/login/$', 'django_cas.views.login', name='login'), + url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'), # Admin panel (r'^admin/filebrowser/', include('filebrowser.urls')), @@ -23,6 +26,7 @@ urlpatterns = patterns('', url(r'^documents/', include('catalogue.urls')), url(r'^apiclient/', include('apiclient.urls')), url(r'^editor/', include('wiki.urls')), + url(r'^images/', include('wiki_img.urls')), # Static files (should be served by Apache) url(r'^%s(?P.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',