X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e9327dee290c524806c89e1c3cb546f95ee51e52..1687f78a694957f2cc3d357d7dcd4e498f0fafd8:/wolnelektury/urls.py?ds=inline

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index 4ec1b3713..f6cd8d927 100644
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -11,6 +11,7 @@ admin.autodiscover()
 
 urlpatterns = patterns('wolnelektury.views',
     url(r'^$', 'main_page', name='main_page'),
+    url(r'^planowane/$', 'publish_plan', name='publish_plan'),
 
     url(r'^zegar/$', 'clock', name='clock'),
 
@@ -18,6 +19,7 @@ urlpatterns = patterns('wolnelektury.views',
     url(r'^uzytkownicy/zaloguj/$', views.LoginFormView(), name='login'),
     url(r'^uzytkownicy/utworz/$', views.RegisterFormView(), name='register'),
     url(r'^uzytkownicy/wyloguj/$', 'logout_then_redirect', name='logout'),
+    url(r'^uzytkownicy/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'),
 )
 
 urlpatterns += patterns('',
@@ -29,6 +31,7 @@ urlpatterns += patterns('',
     url(r'^przypisy/', include('dictionary.urls')),
     url(r'^raporty/', include('reporting.urls')),
     url(r'^info/', include('infopages.urls')),
+    url(r'^ludzie/', include('social.urls')),
 
     # Admin panel
     url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),
@@ -39,6 +42,8 @@ urlpatterns += patterns('',
     # API
     (r'^api/', include('api.urls')),
 
+    url(r'^fullsearch/', include('search.urls')),
+
     # Static files
     url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),