Skip to content

[pull] main from immich-app:main #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jan 6, 2026
Merged

[pull] main from immich-app:main #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f59cff4
fix(web): use asset date for change date popup when single asset sele…
majiayu000 Jan 6, 2026
7efce38
fix(web): long text taking more width than expected in duplicate mana…
HemendraSinghShekhawat Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"features": "Features",
"features_in_development": "Features in Development",
"features_setting_description": "Manage the app features",
"file_name": "File name",
"file_name": "File name: {file_name}",
"file_name_or_extension": "File name or extension",
"file_size": "File size",
"filename": "Filename",
Expand Down
7 changes: 5 additions & 2 deletions web/src/lib/components/timeline/actions/ChangeDateAction.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
import { getAssetControlContext } from '$lib/components/timeline/AssetSelectControlBar.svelte';
import AssetSelectionChangeDateModal from '$lib/modals/AssetSelectionChangeDateModal.svelte';
import { fromTimelinePlainDateTime } from '$lib/utils/timeline-util';
import { modalManager } from '@immich/ui';
import { mdiCalendarEditOutline } from '@mdi/js';
import { DateTime } from 'luxon';
Expand All @@ -14,9 +15,11 @@
const { clearSelect, getOwnedAssets } = getAssetControlContext();

const handleChangeDate = async () => {
const assets = getOwnedAssets();
const initialDate = assets.length === 1 ? fromTimelinePlainDateTime(assets[0].localDateTime) : DateTime.now();
const success = await modalManager.show(AssetSelectionChangeDateModal, {
initialDate: DateTime.now(),
assets: getOwnedAssets(),
initialDate,
assets,
});
if (success) {
clearSelect();
Expand Down
8 changes: 6 additions & 2 deletions web/src/lib/components/utilities-page/duplicates/duplicate-asset.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
}
</script>

<div class="min-w-60 transition-colors border rounded-lg">
<div class="min-w-60 transition-colors border rounded-lg flex-1">
<div class="relative w-full">
<button
type="button"
Expand Down Expand Up @@ -168,7 +168,11 @@
? 'bg-success/15 dark:bg-[#001a06]'
: 'bg-transparent'}"
>
<InfoRow icon={mdiImageOutline} highlight={hasDifferentValues.fileName} title={$t('file_name')}>
<InfoRow
icon={mdiImageOutline}
highlight={hasDifferentValues.fileName}
title={$t('file_name', { values: { file_name: asset.originalFileName ?? '' } })}
>
{asset.originalFileName}
</InfoRow>

Expand Down
2 changes: 1 addition & 1 deletion web/src/lib/components/utilities-page/duplicates/duplicates-compare-control.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
</div>

<div class="overflow-x-auto p-2">
<div class="flex flex-nowrap gap-1 place-items-center justify-center min-w-full w-fit mx-auto">
<div class="flex flex-nowrap gap-1 place-items-start justify-center min-w-full w-fit mx-auto">
{#each assets as asset (asset.id)}
<DuplicateAsset {assets} {asset} {onSelectAsset} isSelected={selectedAssetIds.has(asset.id)} {onViewAsset} />
{/each}
Expand Down
4 changes: 2 additions & 2 deletions web/src/lib/components/utilities-page/duplicates/info-row.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

<div class="grid grid-cols-[25px_1fr] w-full px-1 py-0.5" class:border-b={borderBottom} {title}>
<Icon {icon} size="18" class="text-dark/25 {highlight ? 'text-primary/75' : ''}" />
<div class="justify-self-end text-end rounded px-1 transition-colors">
<Text size="tiny" class={highlight ? 'font-semibold text-primary' : ''}>
<div class="justify-self-end text-end rounded px-1 transition-colors w-full overflow-hidden">
<Text size="tiny" class={`${highlight ? 'font-semibold text-primary' : ''} text-ellipsis w-full overflow-hidden`}>
{@render children?.()}
</Text>
</div>
Expand Down
Loading