Merge branch 'master' into dev

src/paperless/settings.py

@@ -72,6 +72,7 @@ INSTALLED_APPS = [
     "corsheaders",
     "django_extensions",
 
+    "paperless",
     "documents.apps.DocumentsConfig",
     "reminders.apps.RemindersConfig",
     "paperless_tesseract.apps.PaperlessTesseractConfig",

src/paperless/urls.py

@@ -6,6 +6,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import RedirectView
 from rest_framework.routers import DefaultRouter
 
+from paperless.views import FaviconView
 from documents.views import (
     CorrespondentViewSet,
     DocumentViewSet,
@@ -46,6 +47,9 @@ urlpatterns = [
     # File uploads
     url(r"^push$", csrf_exempt(PushView.as_view()), name="push"),
 
+    # Favicon
+    url(r"^favicon.ico$", FaviconView.as_view(), name="favicon"),
+
     # The Django admin
     url(r"admin/", admin.site.urls),
 

src/paperless/views.py

@@ -1,3 +1,7 @@
+import os
+
+from django.http import HttpResponse
+from django.views.generic import View
 from rest_framework.pagination import PageNumberPagination
 
 
@@ -5,3 +9,17 @@ class StandardPagination(PageNumberPagination):
     page_size = 25
     page_size_query_param = "page-size"
     max_page_size = 100000
+
+
+class FaviconView(View):
+
+    def get(self, request, *args, **kwargs):
+        favicon = os.path.join(
+            os.path.dirname(__file__),
+            "static",
+            "paperless",
+            "img",
+            "favicon.ico"
+        )
+        with open(favicon, "rb") as f:
+            return HttpResponse(f, content_type="image/x-icon")