Merge pull request #237 from damongolding/task/release

0.14.6
damongolding · Dec 19, 2024 · acc492f · acc492f
2 parents 6f0bc23 + 96af35a
commit acc492f
Show file tree

Hide file tree

Showing 28 changed files with 482 additions and 498 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -34,7 +34,7 @@ jobs:
         include:
           - language: go
             build-mode: manual
-          - language: javascript-typescript
+          - language: typescript
             build-mode: none
         # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
         # Use `c-cpp` to analyze code written in C, C++ or both

diff --git a/README.md b/README.md
@@ -262,6 +262,8 @@ services:
       KIOSK_IMAGE_EFFECT_AMOUNT: 120
       KIOSK_USE_ORIGINAL_IMAGE: false
       # Image metadata
+      KIOSK_SHOW_ALBUM_NAME: false
+      KIOSK_SHOW_PERSON_NAME: false
       KIOSK_SHOW_IMAGE_TIME: false
       KIOSK_IMAGE_TIME_FORMAT: 24
       KIOSK_SHOW_IMAGE_DATE: false
@@ -357,6 +359,8 @@ See the file `config.example.yaml` for an example config file
 | [image_effect](#image-effects)        | KIOSK_IMAGE_EFFECT        | zoom \| smart-zoom    | ""          | Add an effect to images.                                                               |
 | [image_effect_amount](#image-effects) | KIOSK_IMAGE_EFFECT_AMOUNT | int                   | 120         | Set the intensity of the image effect. Use a number between 100 (minimum) and higher, without the % symbol. |
 | use_original_image                | KIOSK_USE_ORIGINAL_IMAGE | bool                      | false       | Use the original image. NOTE: If the original is not a png, gif, jpeg or webp Kiosk will fallback to using the preview. |
+| show_album_name                   | KIOSK_SHOW_ALBUM_NAME   | bool                       | false       | Display the album name if one or more album IDs are specified.                          |
+| show_person_name                  | KIOSK_SHOW_PERSON_NAME  | bool                       | false       | Display the person name if one or more person IDs are specified.                        |
 | show_image_time                   | KIOSK_SHOW_IMAGE_TIME   | bool                       | false       | Display image time from METADATA (if available).                                           |
 | image_time_format                 | KIOSK_IMAGE_TIME_FORMAT | 12 \| 24                   | 24          | Display image time in either 12 hour or 24 hour format. Can either be 12 or 24.            |
 | show_image_date                   | KIOSK_SHOW_IMAGE_DATE   | bool                       | false       | Display the image date from METADATA (if available).                                       |

diff --git a/config.example.yaml b/config.example.yaml
@@ -3,9 +3,9 @@ immich_api_key: ""
 immich_url: ""
 
 ## Clock
-show_time: false # true or false
+show_time: false
 time_format: 24 # 12 or 24
-show_date: false # true or false
+show_date: false
 date_format: YYYY/MM/DD
 
 ## Kiosk behaviour
@@ -48,15 +48,17 @@ cross_fade_transition_duration: 1 # in seconds
 
 ## Image display settings
 show_progress: false # display a progress bar
-image_fit: contain # how the image fits the screen. Options are none, contain and cover
-image_effect: none
+image_fit: contain # Options are none, contain and cover
+image_effect: none # Options are none, zoom and smart-zoom
 image_effect_amount: 120
 use_original_image: false # use the original file.
 
 ## Image METADATA
-show_image_time: false # true or false
+show_album_name: false
+show_person_name: false
+show_image_time: false
 image_time_format: 24 # 12 or 24
-show_image_date: false # true or false
+show_image_date: false
 image_date_format: YYYY-MM-DD
 show_image_description: false
 show_image_exif: false

diff --git a/frontend/package.json b/frontend/package.json
@@ -19,20 +19,22 @@
   },
   "devDependencies": {
     "autoprefixer": "^10.4.20",
-    "browserslist": "^4.24.2",
+    "browserslist": "^4.24.3",
     "date-fns": "^4.1.0",
     "esbuild": "^0.24.0",
-    "eslint": "^9.16.0",
-    "eslint-plugin-compat": "^6.0.1",
+    "eslint": "^9.17.0",
+    "eslint-plugin-compat": "^6.0.2",
     "globals": "^15.13.0",
-    "htmx.org": "^2.0.3",
+    "htmx.org": "^2.0.4",
     "postcss": "^8.4.49",
     "postcss-cli": "^11.0.0",
     "postcss-nested": "^7.0.2",
     "typescript": "^5.7.2"
   },
   "browserslist": [
-    "> 0.3%",
+    "> 0.2%",
+    "not ios 11",
+    "not android 131",
     "not op_mini all",
     "not IE 11"
   ]