From 50b509d6938214156ddb23bbfa7637db618f8dc5 Mon Sep 17 00:00:00 2001
From: Orel <ryiseld@gmail.com>
Date: Tue, 25 May 2021 03:57:04 -0700
Subject: [PATCH 1/7] Make sidemenu text smaller and add horizontal padding (on
 large screens)

---
 ui/src/Layout.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/Layout.tsx b/ui/src/Layout.tsx
index 4ca3f16..0fe2235 100644
--- a/ui/src/Layout.tsx
+++ b/ui/src/Layout.tsx
@@ -34,7 +34,7 @@ const Container = styled.div`
 
 const SideMenuContainer = styled.div`
   height: 100%;
-  width: 80px;
+  width: 150px;
   left: 0;
   padding-top: 70px;
 
@@ -61,7 +61,7 @@ const Content = styled.div`
 const SideButtonLink = styled(NavLink)`
   text-align: center;
   padding-top: 8px;
-  padding-left: 2px;
+  padding-left: 10px;
   display: block;
   width: 60px;
   height: 60px;
@@ -104,7 +104,7 @@ const SideButton = ({
 }
 
 const SideButtonLabel = styled.div`
-  font-size: 16px;
+  font-size: 14px;
 `
 
 export const SideMenu = () => {

From 491a5ab19a2370f53e864b98860062539a5687e5 Mon Sep 17 00:00:00 2001
From: viktorstrate <viktorstrate@gmail.com>
Date: Tue, 25 May 2021 17:26:47 +0200
Subject: [PATCH 2/7] Fix UI build halt problem

---
 ui/build.mjs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/build.mjs b/ui/build.mjs
index 261d609..392e0e4 100644
--- a/ui/build.mjs
+++ b/ui/build.mjs
@@ -51,14 +51,17 @@ const esbuildOptions = {
     '.png': 'file',
   },
   define: defineEnv,
-  incremental: watchMode,
-  watch: {
+}
+
+if (watchMode) {
+  esbuildOptions.incremental = true
+  esbuildOptions.watch = {
     onRebuild(err) {
       if (err == null) {
         bs.reload()
       }
     },
-  },
+  }
 }
 
 fs.emptyDirSync('dist/')

From 49fb142fd25dc93aa3e0f23ad314329d0d8a8a48 Mon Sep 17 00:00:00 2001
From: Damiano Zanardo <damiano.zanardo@gmail.com>
Date: Sun, 30 May 2021 01:56:07 +0200
Subject: [PATCH 3/7] italian translation updated

---
 ui/extractedTranslations/it/translation.json | 46 ++++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/ui/extractedTranslations/it/translation.json b/ui/extractedTranslations/it/translation.json
index 05cd708..92bcca6 100644
--- a/ui/extractedTranslations/it/translation.json
+++ b/ui/extractedTranslations/it/translation.json
@@ -69,55 +69,55 @@
   "people_page": {
     "face_group": {
       "action": {
-        "add_label": null,
-        "change_label": null,
-        "detach_face": null,
-        "merge_face": null,
-        "move_faces": null
+        "add_label": "Aggiungi etichetta",
+        "change_label": "Cambia etichetta",
+        "detach_face": "Separa volto",
+        "merge_face": "Unisci volto",
+        "move_faces": "Sposta volti"
       },
       "label_placeholder": "Etichetta",
       "unlabeled": "Senza etichetta",
-      "unlabeled_person": null
+      "unlabeled_person": "Persona senza etichetta"
     },
     "modal": {
       "action": {
-        "merge": null
+        "merge": "Unisci"
       },
       "detach_image_faces": {
         "action": {
-          "detach": null,
-          "select_images": null
+          "detach": "Separa immagini",
+          "select_images": "Seleziona le immagini da separare"
         },
-        "description": null,
-        "title": null
+        "description": "Separa le immagini selezionate di questo volto e muovile in nuovo volto",
+        "title": "Separa immagini volto"
       },
       "merge_face_groups": {
-        "description": null,
+        "description": "Tutte le immagini di questo volto saranno unite alle immagini del volto selezionato",
         "destination_table": {
-          "title": null
+          "title": "Seleziona il volto di destinazione"
         },
-        "title": null
+        "title": "Unisci immagini volto"
       },
       "move_image_faces": {
-        "description": null,
+        "description": "Sposta le immagini selezionate di questo volto in un altro volto",
         "destination_face_group_table": {
-          "move_action": null,
-          "title": null
+          "move_action": "Muovi immagini",
+          "title": "Seleziona il volto di destinazione"
         },
         "image_select_table": {
-          "next_action": null,
-          "title": null
+          "next_action": "Avanti",
+          "title": "Seleziona immagini"
         },
-        "title": null
+        "title": "Muovi immagini volto"
       }
     },
     "recognize_unlabeled_faces_button": "Identifica facce senza etichetta",
     "table": {
       "select_face_group": {
-        "search_faces_placeholder": null
+        "search_faces_placeholder": "Cerca volti..."
       },
       "select_image_faces": {
-        "search_images_placeholder": null
+        "search_images_placeholder": "Cerca immagini..."
       }
     }
   },
@@ -304,4 +304,4 @@
     "people": "Persone",
     "settings": "Impostazioni"
   }
-}
+}
\ No newline at end of file

From 52c2c7616910929b4f4cc65e3b1ad2a991f54130 Mon Sep 17 00:00:00 2001
From: feinedsquirrel <feinedsquirrel@gmail.com>
Date: Fri, 4 Jun 2021 14:45:33 -0600
Subject: [PATCH 4/7] update Kagami/go-face target commit and new deps for it

---
 .github/workflows/tests.yml          | 2 +-
 README.md                            | 4 ++--
 api/go.mod                           | 2 +-
 api/go.sum                           | 4 ++--
 docker/install_build_dependencies.sh | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d82a82b..848aa56 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -72,7 +72,7 @@ jobs:
           sudo add-apt-repository ppa:strukturag/libheif
           sudo add-apt-repository ppa:strukturag/libde265
           sudo apt-get update
-          sudo apt-get install -y libdlib-dev libblas-dev liblapack-dev libjpeg-turbo8-dev libheif-dev
+          sudo apt-get install -y libdlib-dev libblas-dev libatlas-base-dev liblapack-dev libjpeg-turbo8-dev libheif-dev
 
       - name: Get GO dependencies
         run: |
diff --git a/README.md b/README.md
index 2e4db9c..ef57f2b 100644
--- a/README.md
+++ b/README.md
@@ -119,9 +119,9 @@ They can be installed as shown below:
 
 ```sh
 # Ubuntu
-sudo apt-get install libdlib-dev libblas-dev liblapack-dev libjpeg-turbo8-dev libheif-dev
+sudo apt-get install libdlib-dev libblas-dev libatlas-base-dev liblapack-dev libjpeg-turbo8-dev libheif-dev
 # Debian
-sudo apt-get install libdlib-dev libblas-dev liblapack-dev libjpeg62-turbo-dev libheif-dev
+sudo apt-get install libdlib-dev libblas-dev libatlas-base-dev liblapack-dev libjpeg62-turbo-dev libheif-dev
 # macOS
 brew install dlib libheif
 
diff --git a/api/go.mod b/api/go.mod
index 801265e..d433f0e 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -4,7 +4,7 @@ go 1.16
 
 require (
 	github.com/99designs/gqlgen v0.13.0
-	github.com/Kagami/go-face v0.0.0-20200825065730-3dd2d74dccfb
+	github.com/Kagami/go-face v0.0.0-20210604182630-c482b0e1acfb
 	github.com/agnivade/levenshtein v1.1.0 // indirect
 	github.com/barasher/go-exiftool v1.4.0
 	github.com/disintegration/imaging v1.6.2
diff --git a/api/go.sum b/api/go.sum
index 08336cc..7331992 100644
--- a/api/go.sum
+++ b/api/go.sum
@@ -5,8 +5,8 @@ github.com/99designs/gqlgen v0.13.0 h1:haLTcUp3Vwp80xMVEg5KRNwzfUrgFdRmtBY8fuB8s
 github.com/99designs/gqlgen v0.13.0/go.mod h1:NV130r6f4tpRWuAI+zsrSdooO/eWUv+Gyyoi3rEfXIk=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Kagami/go-face v0.0.0-20200825065730-3dd2d74dccfb h1:DXwA1Te9paM+nsdTGc7uve37lq7WEbQO+gwGBPVwQuQ=
-github.com/Kagami/go-face v0.0.0-20200825065730-3dd2d74dccfb/go.mod h1:9wdDJkRgo3SGTcFwbQ7elVIQhIr2bbBjecuY7VoqmPU=
+github.com/Kagami/go-face v0.0.0-20210604182630-c482b0e1acfb h1:/XDrbCx+BZHdUz8cudJBGdCVqMI+b4HMdH5Y8D7k7sA=
+github.com/Kagami/go-face v0.0.0-20210604182630-c482b0e1acfb/go.mod h1:9wdDJkRgo3SGTcFwbQ7elVIQhIr2bbBjecuY7VoqmPU=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
diff --git a/docker/install_build_dependencies.sh b/docker/install_build_dependencies.sh
index 8df681f..3bea316 100644
--- a/docker/install_build_dependencies.sh
+++ b/docker/install_build_dependencies.sh
@@ -31,6 +31,7 @@ apt-get install -y ca-certificates golang
 apt-get install -y \
   libdlib-dev:${DEBIAN_ARCH} \
   libblas-dev:${DEBIAN_ARCH} \
+  libatlas-base-dev:${DEBIAN_ARCH} \
   liblapack-dev:${DEBIAN_ARCH} \
   libjpeg-dev:${DEBIAN_ARCH} \
   libheif-dev:${DEBIAN_ARCH}

From 19c8dd56b40cfbd114cea186c4ec0a0b6b5a13d4 Mon Sep 17 00:00:00 2001
From: Bishop Clark <bishopolis@gmail.com>
Date: Sat, 5 Jun 2021 22:59:54 -0700
Subject: [PATCH 5/7] Update README.md

'Setup' and 'set up' are as different as noun and verb.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ef57f2b..51ca8ef 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Password: **demo**
 - [Main features](#main-features)
 - [Why yet another self-hosted photo gallery](#why-yet-another-self-hosted-photo-gallery)
 - [Getting started - Setup with Docker](#getting-started---setup-with-docker)
-- [Setup development environment](#setup-development-environment)
+- [Set up development environment](#setup-development-environment)
 - [Sponsors](#sponsors)
 
 ## Main features
@@ -102,7 +102,7 @@ A new admin user will be created, with access to the photos located at the path
 
 The photos will have to be scanned before they show up, you can start a scan manually, by navigating to `Settings` and clicking on `Scan All`
 
-## Setup development environment
+## Set up development environment
 
 ### Local setup
 

From 907f6631dfaabd4690a2e016ff0f607f5520af24 Mon Sep 17 00:00:00 2001
From: viktorstrate <viktorstrate@gmail.com>
Date: Tue, 29 Jun 2021 07:32:34 +0200
Subject: [PATCH 6/7] Add new sponsors to readme

Thank you @deexno and @FKrauss :heart:
---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index 51ca8ef..21ad77a 100644
--- a/README.md
+++ b/README.md
@@ -167,4 +167,16 @@ And the graphql playground at [localhost:4001](http://localhost:4001)
       <b>@Revorge</b>
     </a>
   </td>
+  <td>
+    <a href="https://github.com/deexno">
+      <img src="https://avatars.githubusercontent.com/u/50229919?v=4" height="auto" width="100" style="border-radius:50%"><br/>
+      <b>@deexno</b>
+    </a>
+  </td>
+  <td>
+    <a href="https://github.com/FKrauss">
+      <img src="https://avatars.githubusercontent.com/u/4820683?v=4" height="auto" width="100" style="border-radius:50%"><br/>
+      <b>@FKrauss</b>
+    </a>
+  </td>
 </table>

From 7c993832ecd299c9cebd4762c03064a9a6623bba Mon Sep 17 00:00:00 2001
From: Marco Herrn <marco@mherrn.de>
Date: Mon, 12 Jul 2021 11:36:23 +0200
Subject: [PATCH 7/7] Add support for Matroska (MKV) video container

---
 api/scanner/media_type/media_type.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/api/scanner/media_type/media_type.go b/api/scanner/media_type/media_type.go
index 0281748..87c5745 100644
--- a/api/scanner/media_type/media_type.go
+++ b/api/scanner/media_type/media_type.go
@@ -67,6 +67,7 @@ const (
 	TypeMOV  MediaType = "video/quicktime"
 	TypeTS   MediaType = "video/mp2t"
 	TypeMTS  MediaType = "video/MP2T"
+	TypeMKV  MediaType = "video/x-matroska"
 )
 
 var SupportedMimetypes = [...]MediaType{
@@ -130,6 +131,7 @@ var VideoMimetypes = [...]MediaType{
 	TypeMOV,
 	TypeTS,
 	TypeMTS,
+	TypeMKV,
 }
 
 // WebVideoMimetypes are video types that can be played directly in the browser without transcoding
@@ -196,6 +198,7 @@ var fileExtensions = map[string]MediaType{
 	".ts":   TypeTS,
 	".m2ts": TypeMTS,
 	".mts":  TypeMTS,
+	".mkv":  TypeMKV,
 }
 
 func (imgType *MediaType) IsRaw() bool {
