Commit adfbe26
committed
Merge upstream/main (11 commits): iOS dismiss-sync, sidebar perf, founder welcome
PRs included:
- iOS notifications cross-device dismiss-sync + authoritative unread count
- iOS workspace row actions (manaflow-ai#6022)
- Sidebar perf: kill LazyVStack layout livelock (manaflow-ai#6019 + manaflow-ai#6024)
- iOS sign-out local-first offline-safe revocation
- iOS workspace list groups, unread dots, last-activity previews
- Refresh notification fallback sound DnD
- Email Founder's Edition customers welcome via Resend webhook
- Misc swift-file-length-budget refresh + extract NotificationSoundSettings
- cloud-testflight --marketing-version override
Fork-side adjustments:
- Drop fork's mobileAllowsWorkspaceAction static helper from TerminalController:
upstream put it in Sources/TerminalController+MobileNotificationSync.swift
- Restore fork's renameTopLevelLayoutTabContaining and
closeTopLevelLayoutTabContaining methods on Workspace (TerminalController
v2WorkspaceTopTabRename/Close call sites depended on them)
- pbxproj keep-both for upstream new files + fork P41 entries
- Budget tsv merged via max-per-path script110 files changed
Lines changed: 9888 additions & 1915 deletions
File tree
- .github
- Packages
- CmuxAuthRuntime
- Sources/CmuxAuthRuntime
- BrowserSignIn
- Client
- Coordinator
- Push
- Tests/CmuxAuthRuntimeTests
- CmuxMobileRPC
- Sources/CmuxMobileRPC
- Tests/CmuxMobileRPCTests
- CmuxMobileShellModel
- Sources/CmuxMobileShellModel
- Tests/CmuxMobileShellModelTests
- CmuxMobileShellUI
- Sources/CmuxMobileShellUI
- Tests/CmuxMobileShellUITests
- CmuxMobileShell
- Sources/CmuxMobileShell
- Tests/CmuxMobileShellTests
- Resources
- Sources
- Cloud
- Feed
- Mobile
- cmux.xcodeproj
- cmuxTests
- ios
- cmuxPackage/Tests/cmuxFeatureTests
- cmux
- Resources
- scripts
- plans/feat-ios-groups-mobile
- vendor/stack-auth-swift-sdk-prerelease/Sources/StackAuth
- web
- app
- api/stripe/founders-welcome
- services/apns
- tests
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
| 64 | + | |
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
| 77 | + | |
77 | 78 | | |
78 | 79 | | |
79 | 80 | | |
| |||
115 | 116 | | |
116 | 117 | | |
117 | 118 | | |
118 | | - | |
| 119 | + | |
119 | 120 | | |
120 | 121 | | |
121 | 122 | | |
| |||
Lines changed: 15 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
345 | 345 | | |
346 | 346 | | |
347 | 347 | | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
348 | 363 | | |
349 | 364 | | |
350 | 365 | | |
| |||
Lines changed: 41 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
64 | | - | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
65 | 104 | | |
Lines changed: 33 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
84 | | - | |
85 | | - | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
86 | 117 | | |
87 | 118 | | |
88 | 119 | | |
| |||
0 commit comments