Merge branch 'curated' into claude/quartz-1-15-2-compat-c8267f

Both sides had taken schema version 21: curated for the nullable
FrostSigningSession.signDeclinedAt (one refusal takes a member out of the n),
this branch for the Marmot current profile's three columns, with 22 and 23
behind it for the routing table and the publish obligations. Curated keeps 21.
This branch's three migrations move up one -- 21->22, 22->23, 23->24 -- and
the database is at 24; the comment on 22 says they moved and why.

The exported schemas for 22 and 23 could not be hand-edited, since each is a
snapshot of the whole entity set with an identity hash over it, and could
not be produced from the merged tree, which only exports its own version. So
each was regenerated the way the originals were: the tree of the commit that
introduced it (Phase 3 for 22, Phase 4 for 23), with curated's entity change
and its 21.json dropped in, the version bumped, and KSP run. The result is
what a device on curated's 21 migrates through: 22 adds the three columns
and nothing else, 23 adds MarmotRouting, 24 adds MarmotPublishObligation and
MarmotOutboundGate together with MarmotCommitResult.obligationId, and every
one of them carries signDeclinedAt. 24.json is the merged tree's own export.

Everything else merged itself: ChatMessage's kinds and line types, the
transcript's icons, the strings, the nav host. Full jvmTest 1220 green,
Android debug compile, M3 audit.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Kgothatso NgakoandClaude Opus 5 committed 2026-09-14 08:09:54 +02:00
commit 984db0a180
36 files changed
+8053 -286

No files matched your search

@@ -65,6 +65,7 @@
<string name="creating_new_chat">Creating new chat.</string>
<string name="currently_no_contacts_please_search_and_chat">Currently no contacts. Please search and chat with a few people.</string>
<string name="currently_no_messages_have_been_shared">Currently no messages have been shared.\nBreak the ice.</string>
<string name="declined_to_sign">Declined to sign</string>
<string name="delete_group">Delete group</string>
<string name="details">Details</string>
<string name="dialect_name">Dialect name</string>
@@ -476,6 +477,18 @@
<string name="edit_schema">Edit schema</string>
<string name="propose_schema">Propose schema</string>
<string name="fields_colon">Fields: %1$s</string>
<!-- The template picker a new schema starts on: curare.to's "Start a list" page, with its four shapes. -->
<string name="start_a_list">Start a list</string>
<string name="a_list_is_a_schema_what_an_entry_may_contain">A list is a schema: what an entry may contain, who may suggest one, and where it lives. The group signs it with its shared key, and only that key can put an entry on the list.</string>
<string name="pick_a_shape_to_start_from">Pick a shape to start from. Everything in it can be changed before the group signs.</string>
<string name="template_links">Links &amp; text</string>
<string name="template_links_description">Reddit’s default: a title with a link or some text, a picture if you like, and a flair.</string>
<string name="template_discussion">Discussion</string>
<string name="template_discussion_description">Text posts only: a title and a body, with a flair.</string>
<string name="template_catalogue">Catalogue</string>
<string name="template_catalogue_description">bitcoin.mov’s shape: things with a year, a type, an external id and links — one entry per thing however often it is suggested.</string>
<string name="template_custom">Custom</string>
<string name="template_custom_description">Just the two fields every list has — an identifier and a title — and whatever you add.</string>
<string name="visibility_public">Public</string>
<string name="visibility_closed">Closed</string>
<string name="visibility_private">Private</string>