Merge branch 'master' into dev

2025-09-16 21:55:37 -05:00 · 2018-09-06 00:28:58 +02:00
parent 131e1c9dd8 c765ef5eeb
commit 13725ef8ee
23 changed files with 263 additions and 208 deletions
--- a/src/paperless/urls.py
+++ b/src/paperless/urls.py
@@ -29,10 +29,11 @@ urlpatterns = [
    # API
    url(
        r"^api/auth/",
-        include('rest_framework.urls', namespace="rest_framework")
+        include(
+            ('rest_framework.urls', 'rest_framework'),
+            namespace="rest_framework")
    ),
-
-    url(r"^api/", include((router.urls, 'drf'))),
+    url(r"^api/", include((router.urls, 'drf'), namespace="drf")),

    # File downloads
    url(