mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

:Merge branch 'updating_calendar' of https://github.com/tmslav/dynamicweb into tmslav-updating_calendar

Browse source 
Conflicts:
	dynamicweb/urls.py
This commit is contained in:
rascencio 2016-04-23 19:08:23 +02:00
commit c653917358
25 changed files with 6477 additions and 3800 deletions
Download patch file Download diff file Expand all files Collapse all files

2
digitalglarus/urls.py
View file

@ -10,6 +10,8 @@ urlpatterns = [
url(_(r'about/?$'), AboutView.as_view(), name='about'),
url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
url(_(r'supporters/?$'), views.supporters, name='supporters'),
url(_(r'calendar_api/(?P<month>\d+)/(?P<year>\d+)?$'),views.CalendarApi.as_view()),
url(_(r'calendar_api/'),views.CalendarApi.as_view()),
url(_(r'support-us/?$'), views.support, name='support'),
url(r'^blog/(?P<slug>\w[-\w]*)/$', views.blog_detail, name='blog-detail'),
url(r'blog/$', views.blog, name='blog'),