Skip to content

sync upstream main - #83

Merged
tarik02 merged 16 commits into
mainfrom
sync-upstream-main-20260728-3
Jul 28, 2026
Merged

sync upstream main#83
tarik02 merged 16 commits into
mainfrom
sync-upstream-main-20260728-3

Conversation

@tarik02

@tarik02 tarik02 commented Jul 28, 2026

Copy link
Copy Markdown
Collaborator

What Changed

  • merged 15 commits from pingdotgg/t3code:main through 887dd6e455bb969c1a0c9659a6bdf2baceac030d
  • preserved the fork-only context-menu setting while accepting the upstream appearance-settings move
  • regenerated the lockfile from the merged manifests and patches

Why

Keep the fork aligned with the latest upstream changes for the next stable release.

UI Changes

No fork-specific UI changes. This PR inherits upstream UI changes.

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes
  • I included a video for animation/interaction changes

juliusmarminge and others added 16 commits July 28, 2026 00:55
@juliusmarminge
Add OTA update checks to mobile settings (#4686)
a148e08
@t3dotgg @claude
fix(mobile): threads load snapped to bottom on iOS (#4689)
476d69c 
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg @claude
feat: default sidebar v2 on for nightly and dev builds (#4491)
c13a021 
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
@maxktz
fix(web): 33 web UI fixes (#4700)
dd5ea32
@juliusmarminge
Make mobile Thread List v2 the default (#4717)
b0c4992
@juliusmarminge
Fix mobile showcase workflow without Clerk (#4718)
d25b157
@juliusmarminge @codex
Fix relay credential lookup for unlinked environments (#4692)
e00781a 
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg
Settle merged PR threads immediately (#4704)
9cf9fc9
@maxktz
feat(web): add maria's sidebar header artwork toggle (#4652)
362f127
@maxktz
feat(web): add appearance settings category (#4715)
4f584da
@0x4bs3nt
fix(desktop): allow updater-controlled relaunch (#4721)
9ccfd9d
@0x4bs3nt
fix(web): prevent diff panel scroll jumping (#4724)
3c50a64
@juliusmarminge @claude
Link inline code file paths in chat markdown (#4726)
55dd016 
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
Fix Android showcase capture and rebuild v2 queued rows (#4730)
f1a68ac 
Co-authored-by: Claude <noreply@anthropic.com>
@t3dotgg @claude
perf(server): negotiate permessage-deflate on the websocket (#4705)
887dd6e 
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@tarik02
sync upstream main
9dc79ea 
# Conflicts:
#	apps/web/src/components/settings/SettingsPanels.tsx
#	pnpm-lock.yaml
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Jul 28, 2026
@tarik02
tarik02 merged commit 204f0e5 into main Jul 28, 2026
13 of 14 checks passed
@tarik02
tarik02 deleted the sync-upstream-main-20260728-3 branch July 28, 2026 17:48
This was referenced Jul 28, 2026
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@tarik02 @juliusmarminge @t3dotgg @maxktz @0x4bs3nt