Repository navigation
chore: sync upstream (2026-11-18) - #33
Open
getBoolean wants to merge 123 commits into
Open
getBoolean wants to merge 123 commits into
getBoolean wants to merge 123 commits into
Conversation
…8091) Co-authored-by: Martin Bergo <14320143+mInrOz@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#38114) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…numbers (pingdotgg#38116) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ustom CSS (pingdotgg#38134) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#38139) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… returns (pingdotgg#38132) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#38141) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…Codex (pingdotgg#38130) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…string (pingdotgg#38150) Co-authored-by: Grok 4.7 <noreply@x.ai> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…at 30 s or starts git gc (pingdotgg#38174)
…dex (pingdotgg#38169) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…SH (pingdotgg#38184) Co-authored-by: Grok 4.7 <noreply@x.ai>
…ptied folder is in use (pingdotgg#38163) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…the page (pingdotgg#38190) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#38193) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s" (pingdotgg#38155) Co-authored-by: Rajvardhan Patil <243567420+RajvardhanPatil07@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… it on an error (pingdotgg#38199) Co-authored-by: azhar <azhar.amir@amartha.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…38182) Co-authored-by: Grok 4.7 <noreply@x.ai> 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)
…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>
…sts no longer crashes the server (pingdotgg#30946) Co-authored-by: Isaac-b-ux <264455269+Isaac-b-ux@users.noreply.github.com> Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#38517) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e a refresh while loading (pingdotgg#38508)
… MCP credentials (pingdotgg#26652) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ject file (pingdotgg#38510) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e hold is already met (pingdotgg#38545)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s in generated folder and branch names (pingdotgg#38540) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…h screens (pingdotgg#38546) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ess (pingdotgg#38553) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ry (pingdotgg#38493) Co-authored-by: Grok 4.7 <noreply@x.ai> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…els (pingdotgg#38556) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#38565) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…11-18 # Conflicts: # .github/workflows/mobile-fingerprint-check.yml # apps/mobile/src/features/files/AttachmentFileScreen.tsx # apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx # apps/mobile/src/features/files/ZipArchiveView.tsx # apps/mobile/src/features/files/thread-file-navigator-pane.tsx # apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx # apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx # apps/mobile/src/features/layout/workspace/WorkspaceNativeTabs.ios.tsx # apps/mobile/src/features/settings/SettingsOpenSourceLicensesRouteScreen.tsx # apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx # apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx # apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx # apps/mobile/src/features/threads/ThreadFeed.tsx # apps/mobile/src/features/threads/ThreadHeader.tsx # apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx # apps/mobile/src/features/threads/thread-inspector-preview.tsx # apps/mobile/src/features/threads/thread-list-v2-items.tsx # apps/mobile/src/features/threads/thread-list-v2-row-appearance.ts # apps/mobile/src/state/entities.ts # apps/web/src/components/GitActionsControl.tsx # apps/web/src/components/chat/useComposerSend.ts # apps/web/src/components/desktopUpdate.logic.ts # apps/web/src/components/settings/ProjectDefaultsSettings.tsx # packages/provider-acp/src/server/clientTerminals.ts
Upstream's no-untranslated-copy rule now covers fork-owned settings, git account prompts and iPad sidebar labels. Wrap them with gt/msg/<T>, regenerate the web and mobile catalogs, and translate the new keys in every locale. Also adapt fork settings to upstream's useSearchableSetting hook and SettingResetButton ariaLabel prop.
This branch has not been deployed
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.
Merges upstream
pingdotgg/t3codemain into the fork:9830b857de..759a173e15(121 commits). The largest upstream change is UI translation (gt-react / gt-react-native) together with thet3code/no-untranslated-copylint rule.Conflicts and resolutions
GitActionsControl.tsx,useComposerSend.ts,desktopUpdate.logic.ts,ProjectDefaultsSettings.tsx): kept the fork's git-account guard and CLI release imports alongside upstream's i18n imports.packages/provider-acp/src/server/clientTerminals.ts: took upstream's case-insensitivemergeEnvironments, then applied the fork's git-account overlay on top of the merged environment..github/workflows/mobile-fingerprint-check.yml: took upstream's newif:and kept the fork'svars.T3CODE_LINUX_RUNNERrunner.gt()anduseMessageseverywhere, and kept the fork's behavior on top:renderNativeScrollViewfor the iPad scroll-marker fixroutemode and uses thefolder.filliconFork adaptations
gt/msg/<T>. This covers git account settings, the dialog and bypass prompts, iPad sidebar utilities, the file preview controls, and the Pull requests / Issues titles. Regenerated the web and mobile catalogs and translated the new keys (web 65, mobile 42) into all 9 locales.gitAccountBypassPromptnow takes a resolver.useSearchableSettinghook and passSettingResetButton's newariaLabelprop.ThreadContextChip,ZipArchiveView,AttachmentFileScreen,IpadSidebarActions.@legendapp/listpatch (fixed in 3.7.3). None of the fork's patched dependencies were bumped.pingdotgg/t3codeguards arrived.Verification
bash scripts/check-fork-manifest.sh: 572 entries present.GitAccountsSettings.browser: 2 testsremoteRegistration: 25 testsprovider-acpserver: 107 testsvp linton apps/web and apps/mobile is clean.node scripts/i18n-check.tspasses. Web typecheck passes.vp run check:changed:build/SourcePackagescheckout (re-run below).--lockfile-onlyinstall passes when run by hand.iOS 17
IOS17_PLACEHOLDER
Merged by Claude Opus 5.5 (claude-opus-5-5) in Claude Code, running in T3 Code.