fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix
[wolnelektury.git]
/
src
/
wolnelektury
/
urls.py
diff --git
a/src/wolnelektury/urls.py
b/src/wolnelektury/urls.py
index
eb6a017
..
2622461
100644
(file)
--- a/
src/wolnelektury/urls.py
+++ b/
src/wolnelektury/urls.py
@@
-1,4
+1,3
@@
-# -*- coding: utf-8 -*-
# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
@@
-7,7
+6,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 m
igdal.urls import urlpatterns as migdal_urlpatterns
+from m
achina.app import board
import catalogue.views
import picture.views
from . import views
import catalogue.views
import picture.views
from . import views
@@
-46,13
+45,19
@@
urlpatterns += [
url(r'^wesprzyj/', include('funding.urls')),
url(r'^ankieta/', include('polls.urls')),
url(r'^biblioteki/', include('libraries.urls')),
url(r'^wesprzyj/', include('funding.urls')),
url(r'^ankieta/', include('polls.urls')),
url(r'^biblioteki/', include('libraries.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'^newsletter/', include('newsletter.urls')),
url(r'^formularz/', include('contact.urls')),
url(r'^isbn/', include('isbn.urls')),
+
+ url(r'^paypal/app-form/$', RedirectView.as_view(
+ url='/towarzystwo/?app=1', permanent=False)),
+ url(r'^towarzystwo/dolacz/$', RedirectView.as_view(
+ url='/towarzystwo/', permanent=False)),
+
+
url(r'^paypal/', include('paypal.urls')),
url(r'^powiadomienie/', include('push.urls')),
url(r'^paypal/', include('paypal.urls')),
url(r'^powiadomienie/', include('push.urls')),
+ url(r'^towarzystwo/', include('club.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'),
@@
-68,6
+73,7
@@
urlpatterns += [
url(r'^szukaj/', include('search.urls')),
url(r'^i18n/', include('django.conf.urls.i18n')),
url(r'^szukaj/', include('search.urls')),
url(r'^i18n/', include('django.conf.urls.i18n')),
+ url(r'^forum/', include(board.urls)),
]
urlpatterns += [
]
urlpatterns += [
@@
-91,8
+97,12
@@
urlpatterns += [
# url(r'^post-test/$', views.post_test),
]
# url(r'^post-test/$', views.post_test),
]
-urlpatterns += migdal_urlpatterns
+if settings.DEBUG:
+ import debug_toolbar
+ urlpatterns = [
+ url(r'^__debug__/', include(debug_toolbar.urls)),
+ ] + urlpatterns
if settings.DEBUG:
urlpatterns += [
if settings.DEBUG:
urlpatterns += [