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

Merge branch 'develop' into feature/emailcommands

Browse Source
This commit is contained in:
Sander Roosendaal
2017-09-26 16:07:50 +02:00
parent 44d9e0648d b6fe67ee91
commit b6d02cb2b6
7 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/urls.py
View File

@@ -102,10 +102,14 @@ handler404 = 'views.error404_view'
handler400 = 'views.error400_view'
handler403 = 'views.error403_view'
from oauth2_provider.views import base
urlpatterns = [
# url(r'^password_change/$',auth_views.password_change),
# url(r'^password_change_done/$',auth_views.password_change_done),
url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
# url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
url(r'^o/authorize/$', base.AuthorizationView.as_view(), name="authorize"),
url(r'^o/token/$', base.TokenView.as_view(), name="token"),
url(r'^', include(router.urls)),
url(r'^api-docs$', views.schema_view),
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),