Merge branch 'main' into feature/readonly-sharing

# Conflicts: # server/src/services/album.service.ts
2024-04-12 17:20:36 +02:00
parent 222bcf853d 97c099e26d
commit 3211894e18
250 changed files with 9537 additions and 4911 deletions
--- a/server/src/queries/asset.repository.sql
+++ b/server/src/queries/asset.repository.sql
@@ -464,7 +464,7 @@ FROM
 WHERE
  (
    (
-      ("AssetEntity"."ownerId" = $1)
+      ("AssetEntity"."libraryId" = $1)
      AND ("AssetEntity"."checksum" = $2)
    )
  )