Skip to content

chore: merge upstream main#13

Merged
Deeds67 merged 15 commits intomainfrom
chore/merge-upstream-main
Mar 6, 2026
Merged

chore: merge upstream main#13
Deeds67 merged 15 commits intomainfrom
chore/merge-upstream-main

Conversation

@Deeds67
Copy link
Collaborator

@Deeds67 Deeds67 commented Mar 6, 2026

Summary

  • Merge latest upstream immich-app/immich main into our fork
  • Includes 6 upstream commits: mobile sync asset edits, search fix, web photo viewer zoom, CSS font variable, playback style migration fix, mobile asset details background fix

Test plan

  • CI checks pass

🤖 Generated with Claude Code

uhthomas and others added 11 commits March 5, 2026 17:45
The background of the photo view does not extend below the height of the
viewport, and so the asset details fade in over black with the photo
view, and the standard surface colour scheme of the scaffold for the
rest. This leads to a janky animation. We can't change the background of
the scaffold to black, as it in turn makes the iOS bouncing scroll
physics cut off incorrectly. The best fix is to remove background
decoration from the photo view, and defer to the parent to colour the
background.

Co-authored-by: Alex <alex.tran1502@gmail.com>
* feat(mobile): SyncAssetEditV1

* fix: websocket handling

* fix: server version requirement

* fix: revert pubspec changes
Covers bug fixes (person thumbnail, download-as-album, album cover),
quick-rotate in viewer toolbar, and batch rotate in timeline.
Design for phased pet detection feature:
- Phase 1: YOLOv8 object detection for animal species
- Phase 2: MegaDescriptor embeddings for individual pet recognition
- Reuses existing person infrastructure (unified with people)
- Opt-in feature, disabled by default

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
10 tasks across 3 phases: bug fixes, quick-rotate, batch rotate.
14-task plan covering Phase 1 (YOLOv8 detection):
- ML Python: PetDetector model, schemas, registration, tests
- Server: enums, config, DTOs, migration, service, job integration
- Web: admin settings, pet badge on people cards
- OpenAPI regeneration

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Search results use a different provider than the main timeline, and they
appear appear to have diverged a bit. This means that assets can
sometimes look wrong or different in search compared to the main
timeline or albums.
@Deeds67 Deeds67 added the changelog:skip Skip changelog entry label Mar 6, 2026
Deeds67 added 4 commits March 6, 2026 07:37
Format plan docs that were failing CI prettier check.
…main

# Conflicts:
#	docs/plans/2026-03-05-image-editing-improvements-design.md
#	docs/plans/2026-03-05-image-editing-improvements-plan.md
#	docs/plans/2026-03-05-pet-detection-design.md
Add git credential configuration using github.token before dart pub get
to avoid unauthenticated rate limits when fetching git dependencies
(native_video_player) on fork CI runners.
@Deeds67 Deeds67 merged commit 32d81c8 into main Mar 6, 2026
29 of 31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants