merge: integrate dev branch, resolve package.json and lockfile conflicts

Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]andajnart committed 2026-03-13 09:20:05 +00:00
1 parent 1e438ec3c3
commit 6cbf72462a
117 files changed
+4495 -1648

No files matched your search

+46
View File
@@ -2091,6 +2091,52 @@
}
}
},
"immich-serverStats": {
"name": "",
"description": "",
"option": {
"showUsers": {
"label": "",
"description": ""
},
"showPhotos": {
"label": "",
"description": ""
},
"showVideos": {
"label": "",
"description": ""
},
"showStorage": {
"label": "",
"description": ""
}
},
"users": "",
"photos": "",
"videos": "",
"storage": ""
},
"immich-albumCarousel": {
"name": "",
"option": {
"albumId": {
"label": "",
"description": ""
},
"rotationIntervalSeconds": {
"label": "",
"description": ""
},
"showPhotoInfo": {
"label": "",
"description": ""
}
},
"description": "",
"noAlbumSelected": "",
"noPhotos": ""
},
"downloads": {
"name": "",
"description": "",