sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'develop' into feature/opaqueid

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-09 15:46:47 +01:00
parent 6c20c3ab7f a7af332db6
commit ebb90e5997
74 changed files with 8245 additions and 1410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowsandall_app/settings_dev.py
View File

@@ -96,3 +96,4 @@ EMAIL_USE_TLS = CFG['email_use_tls']
DEFAULT_FROM_EMAIL = 'info@rowsandall.com'
SETTINGS_NAME = 'rowsandall_app.settings_dev'

2
rowsandall_app/urls.py
View File

@@ -57,7 +57,7 @@ urlpatterns += [
url(r'^admin/', admin.site.urls),
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
url(r'^$',rootview),
url(r'^getblogs$',rowersviews.get_blog_posts),
url(r'^getblogs/$',rowersviews.get_blog_posts),
url(r'^login/',auth_views.login, name='login'),
url(r'^logout/$',auth_views.logout,
{'next_page': '/'},