c-l/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-12-29 15:11:58 +00:00
Code Releases Activity

Merge branch 'main' into feat/kysely

Browse source
This commit is contained in:
Alex 2024-12-20 15:28:44 -06:00 committed by GitHub
commit 5668d332f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/docs/install/config-file.md
View file

@ -83,7 +83,7 @@ The default configuration looks like this:
}, },
"machineLearning": { "machineLearning": {
"enabled": true, "enabled": true,
"url": ["http://immich-machine-learning:3003"], "urls": ["http://immich-machine-learning:3003"],
"clip": { "clip": {
"enabled": true, "enabled": true,
"modelName": "ViT-B-32__openai" "modelName": "ViT-B-32__openai"

13
mobile/lib/services/backup.service.dart
View file

@ -313,15 +313,12 @@ class BackupService {
); );
} }
} else { } else {
if (asset.type == AssetType.video) { file =
file = await asset.local!.originFile; await asset.local!.originFile.timeout(const Duration(seconds: 5));
} else {
file = await asset.local!.originFile if (asset.local!.isLivePhoto) {
livePhotoFile = await asset.local!.originFileWithSubtype
.timeout(const Duration(seconds: 5)); .timeout(const Duration(seconds: 5));
if (asset.local!.isLivePhoto) {
livePhotoFile = await asset.local!.originFileWithSubtype
.timeout(const Duration(seconds: 5));
}
} }
} }

5
web/src/routes/(user)/partners/[userId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
View file

@ -31,7 +31,10 @@
<main class="grid h-screen bg-immich-bg pt-18 dark:bg-immich-dark-bg"> <main class="grid h-screen bg-immich-bg pt-18 dark:bg-immich-dark-bg">
{#if assetInteraction.selectionActive} {#if assetInteraction.selectionActive}
<AssetSelectControlBar assets={assetInteraction.selectedAssets} clearSelect={assetInteraction.clearMultiselect}> <AssetSelectControlBar
assets={assetInteraction.selectedAssets}
clearSelect={() => assetInteraction.clearMultiselect()}
>
<CreateSharedLink /> <CreateSharedLink />
<ButtonContextMenu icon={mdiPlus} title={$t('add')}> <ButtonContextMenu icon={mdiPlus} title={$t('add')}>
<AddToAlbum /> <AddToAlbum />