Merge branch 'dev' into feature-frontend-task-queue

This commit is contained in:
shamoon authored and GitHub committed 2022-07-02 16:54:16 -07:00
commit 92dd70098c
63 files changed
+6726 -10068

No files matched your search

+3 -2
View File
@@ -366,7 +366,8 @@ class DocumentViewSet(
handle = doc.thumbnail_file
# TODO: Send ETag information and use that to send new thumbnails
# if available
return HttpResponse(handle, content_type="image/png")
return HttpResponse(handle, content_type="image/webp")
except (FileNotFoundError, Document.DoesNotExist):
raise Http404()
@@ -749,7 +750,7 @@ class RemoteVersionView(GenericAPIView):
class StoragePathViewSet(ModelViewSet):
model = DocumentType
model = StoragePath
queryset = StoragePath.objects.annotate(document_count=Count("documents")).order_by(
Lower("name"),