Repository navigation
chore(sync): merge Yarden-zamir/t3code main - #40
Merged
Merged
Conversation
…nders before Attach (pingdotgg#38357)
…nger freezes the thread (pingdotgg#38368) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#38377) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…dotgg#38387) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…18-0123 chore(sync): merge pingdotgg/t3code main
…tgg#38393) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…eading (pingdotgg#38397) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#38425) Co-authored-by: Grok 4.7 <noreply@x.ai>
- Wrap fork copy in upstream files with `<T>`, `gt()` and `msg()` so `t3code/no-untranslated-copy` passes. - Fork-only files that predate the rule warn instead, like the existing `no-unreasoned-state-sync` override in vite.config.ts. - Settings rows use `useSearchableSetting()`; `SettingResetButton` takes `ariaLabel`. - Clipboard calls pass a `ClipboardTarget`; terminal labels come from `terminalLabelsCopy`; fork mobile settings titles move to `ROUTE_TITLES`.
…tgg#38431) Co-authored-by: Grok 4.7 <noreply@x.ai> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…18-0323 chore(sync): merge pingdotgg/t3code main
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…failed (pingdotgg#38423) Co-authored-by: Grok 4.7 <noreply@x.ai> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s Chrome, not HeadlessChrome (pingdotgg#38445)
… renders (pingdotgg#38458) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…poser (pingdotgg#38443) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#38451) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#38489) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#38476) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…y the inhibitor failed (pingdotgg#38505)
…18-0523 chore(sync): merge pingdotgg/t3code main
…pingdotgg#29861) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rkup (pingdotgg#33403) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#34663) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…18-0924 chore(sync): merge pingdotgg/t3code main
# Conflicts: # apps/mobile/src/features/threads/thread-list-v2-items.tsx # apps/mobile/src/features/updates/app-updates.ts # apps/web/src/components/Sidebar.tsx # packages/client-runtime/src/state/orchestration.ts
…copy rule Upstream's i18n work makes untranslated copy a lint error. Wrap the fork's continue-elsewhere, APK updater, Inkwire and thread backup strings, keep the agent prompt text English, and regenerate the web and mobile catalogs. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fork Sync run 44298423274 hit merge conflicts while it merged Yarden-zamir/t3code main. Most of the incoming changes are Yarden's i18n work (gt-react strings).
Conflicts and how they were resolved:
apps/mobile/src/features/threads/thread-list-v2-items.tsx: kept the fork'shandleContinueMenudependency and added upstream'sgtandm.apps/mobile/src/features/updates/app-updates.ts: kept the fork's APK updater import and added upstream'smimport.apps/web/src/components/Sidebar.tsx: kept the continue-thread-elsewhere import and added upstream's i18n imports.packages/client-runtime/src/state/orchestration.ts: kept the fork'sloadThreadContinuation, which falls back to an offline thread backup, and moved upstream's translatable "not connected" message into its live-fetch helper.Follow-up for the new settings API:
InkwireSettingsRows.tsxandThreadBackupMachineRow.tsxnow useuseSearchableSetting().ariaLabelinstead oflabel.Machine map: the portal at map.tomcohen.dev is no longer built from this repo. Machines now join with
kitshn join <code> --server <address>.Checks run locally:
vp ipassed.vp run typecheckpassed (42/42).🤖 Generated with Claude Code (Claude Opus 5.5)