diff options
| author |   Jack Morgan <jack.morgan@intel.com> | 2016-09-21 15:48:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-21 15:48:38 +0000 |
| commit | dcc6fa43043c685b7443cbc27da12ad9bf2225c4 (patch) | |
| tree | 7927874aa51afd638e69f46d773e1c0b09d40f6b /tools/pharos-dashboard/pharos_dashboard | |
| parent | 47f2f0a3224b8c990d5b9ab6c9628f9d7cf231b8 (diff) | |
| parent | 3c8baae57206988fbdfc2d858ddc3f134e552f07 (diff) | |
Merge changes from topic 'pharos-dashboard'
* changes:
Add a REST API for the dashboard
Send notifications for booking start and end
Diffstat (limited to 'tools/pharos-dashboard/pharos_dashboard')
| -rw-r--r-- | tools/pharos-dashboard/pharos_dashboard/urls.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/pharos-dashboard/pharos_dashboard/urls.py b/tools/pharos-dashboard/pharos_dashboard/urls.py index d8bf5608..4a9d9149 100644 --- a/tools/pharos-dashboard/pharos_dashboard/urls.py +++ b/tools/pharos-dashboard/pharos_dashboard/urls.py @@ -18,12 +18,16 @@ from django.conf.urls import url, include from django.conf.urls.static import static from django.contrib import admin + urlpatterns = [ url(r'^', include('dashboard.urls', namespace='dashboard')), url(r'^booking/', include('booking.urls', namespace='booking')), url(r'^accounts/', include('account.urls', namespace='account')), url(r'^admin/', admin.site.urls), + url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), + + url(r'^api/', include('api.urls')) ] if settings.DEBUG is True: |