fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change separators for easier escaping
[wolnelektury.git]
/
src
/
wolnelektury
/
urls.py
diff --git
a/src/wolnelektury/urls.py
b/src/wolnelektury/urls.py
index
71bf1b5
..
403cc1f
100644
(file)
--- a/
src/wolnelektury/urls.py
+++ b/
src/wolnelektury/urls.py
@@
-7,6
+7,7
@@
from django.conf import settings
from django.contrib import admin
from django.views.generic import RedirectView
import django.views.static
from django.contrib import admin
from django.views.generic import RedirectView
import django.views.static
+from migdal.urls import urlpatterns as migdal_urlpatterns
import catalogue.views
import picture.views
from . import views
import catalogue.views
import picture.views
from . import views
@@
-25,6
+26,7
@@
urlpatterns = [
url(r'^uzytkownik/signup/$', views.RegisterFormView(), name='register'),
url(r'^uzytkownik/logout/$', views.logout_then_redirect, name='logout'),
url(r'^uzytkownik/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'),
url(r'^uzytkownik/signup/$', views.RegisterFormView(), name='register'),
url(r'^uzytkownik/logout/$', views.logout_then_redirect, name='logout'),
url(r'^uzytkownik/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'),
+ url(r'^uzytkownik/social/signup/$', views.SocialSignupView.as_view(), name='socialaccount_signup'),
# Includes.
url(r'^latests_blog_posts.html$', views.latest_blog_posts, name='latest_blog_posts'),
# Includes.
url(r'^latests_blog_posts.html$', views.latest_blog_posts, name='latest_blog_posts'),
@@
-47,6
+49,10
@@
urlpatterns += [
url(r'^chunks/', include('chunks.urls')),
url(r'^sponsors/', include('sponsors.urls')),
url(r'^newsletter/', include('newsletter.urls')),
url(r'^chunks/', include('chunks.urls')),
url(r'^sponsors/', include('sponsors.urls')),
url(r'^newsletter/', include('newsletter.urls')),
+ url(r'^formularz/', include('contact.urls')),
+ url(r'^isbn/', include('isbn.urls')),
+ url(r'^paypal/', include('paypal.urls')),
+ url(r'^powiadomienie/', include('push.urls')),
# Admin panel
url(r'^admin/catalogue/book/import$', catalogue.views.import_book, name='import_book'),
# Admin panel
url(r'^admin/catalogue/book/import$', catalogue.views.import_book, name='import_book'),
@@
-84,3
+90,10
@@
urlpatterns += [
url(r'^wolontariat/$', RedirectView.as_view(
url='/info/wlacz-sie-w-prace/', permanent=False)),
]
url(r'^wolontariat/$', RedirectView.as_view(
url='/info/wlacz-sie-w-prace/', permanent=False)),
]
+
+urlpatterns += [
+ url(r'^error-test/$', views.exception_test),
+ # url(r'^post-test/$', views.post_test),
+]
+
+urlpatterns += migdal_urlpatterns