diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 31700569..a9898e13 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -92,8 +92,9 @@ match. A 1.1 server works as before, without Integrate; a 1.2 server adds the ph an unhashed photo that turns out different is kept as a second version instead of going to the trash. - Before comparing, a merge hashes the other sequence's unhashed photos that match nothing, so different photos with the same size and time are no longer taken for copies. - - A merge plan lists "Deleted in the other · n" and names the servers it relinks; a merge's second versions stay - discoverable in the kept sequence after the pair is gone. + - A merge plan lists "Deleted in the other · n" and names the servers it relinks; a merge's second versions are + listed from the Library (*Two versions…* on a card's menu, and a merge job's Open), each with *Drop…*: a dry run, + a confirmation naming the version that stays, then the archive trash while the other version is still verified. - The Merge and Integrate plans' block lines name the right sequence, archive, server and space; "already linked" names the server. - An Integrate retried after a failure before its first stage runs again instead of refusing. @@ -146,6 +147,23 @@ match. A 1.1 server works as before, without Integrate; a 1.2 server adds the ph name the lists they head; a merge reads Kept and Other from the start; the Projects part shows where each project goes as soon as it opens. Matches: the This side and Other side columns take the room the actions leave. - The Edit picker's Twin chip sits right after the project name. + - An Integrate started by a sequence's owner who is not an admin runs the plan the dialog showed instead of refusing + it as changed. + - A merge copies a project of the other sequence that only shares its head with a kept project, renders included; + one already copied is skipped and its renders name the copy. + - A merge abandoned at its trash checks (work since the plan, unsent work, a stop) leaves the other sequence its link, + session keys and pairs. + - New photos of an integrated pair paused on a metered connection resume after a restart once it is not metered. + - Apply in the Compare dialog plans again when the choices changed in the last moment, so it never confirms the + previous plan. + - The merge confirmation asks for the photo count without separators and says it in the prompt. + - The session keys line's tooltip no longer shows "{0}"; To trash… and Delete on server… say to select photos first. + - Italian: the Main project reads *Principale* in the match tooltips and the Projects part, the twin chip *Gemello*; + the Edit picker's twin tooltip names the other home's Main in the UI language. + - Matches: long archive names are cut in their middle with the whole name in the tooltip; the Projects part trims long + names and shows the whole row in its tooltip. + - Upload again on a match is enabled only for an account that may send sequences (Upload and Edit), as in the sync + table. ## [1.1.1] — 2026-11-16 diff --git a/docs/DECISIONS.md b/docs/DECISIONS.md index 70fe6b8f..d42a4144 100644 --- a/docs/DECISIONS.md +++ b/docs/DECISIONS.md @@ -960,7 +960,7 @@ One line per decision: date · decision · alternative · reason. | 2026-11-17 | A Corrupt or Missing frame on this PC whose photo the server holds is repaired by an Integrate through the ordinary fetch: the plan lists it as a Fetch (the comparison leaves unusable frames out), and the ingest replaces the damaged holder in place, the old file moved aside as `.damaged-