Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions SMG.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ What we carry on top of upstream. `git log --first-parent --oneline main..smg` i
| Branch | Type | Upstream PR | State | Upstream files touched |
| --- | --- | --- | --- | --- |
| `feat/members-table-search` | A | [CapSoftware/Cap#3919](https://github.com/CapSoftware/Cap/pull/3919) | In smg ([#4](https://github.com/Solomedia/cap/pull/4)), PR open upstream | `apps/web/app/(org)/dashboard/settings/organization/components/MembersCard.tsx`, `apps/web/content/docs/teams.mdx` |
| `feat/preview-og-fallback-relative-redirect` | A | Not opened yet | In smg ([#10](https://github.com/Solomedia/cap/pull/10)) | `apps/web/app/api/video/preview/route.ts` |
| `feat/share-unfurl-ai-summary` | A | Not opened yet | In smg ([#11](https://github.com/Solomedia/cap/pull/11)) | `apps/web/app/s/[videoId]/page.tsx`, `apps/web/lib/share-video-metadata.ts` |
| `feat/google-account-linking` | A | Not opened yet | In smg ([#12](https://github.com/Solomedia/cap/pull/12)) | `packages/database/auth/auth-options.ts`, `apps/web/app/(org)/login/form.tsx` |
| `feat/preview-og-fallback-relative-redirect` | A | [CapSoftware/Cap#3963](https://github.com/CapSoftware/Cap/pull/3963) | In smg ([#10](https://github.com/Solomedia/cap/pull/10)), PR open upstream | `apps/web/app/api/video/preview/route.ts` |
| `feat/share-unfurl-ai-summary` | A | Not opened (improvement, not a fix; propose later if wanted) | In smg ([#11](https://github.com/Solomedia/cap/pull/11)) | `apps/web/app/s/[videoId]/page.tsx`, `apps/web/lib/share-video-metadata.ts` |
| `feat/google-account-linking` | A | [CapSoftware/Cap#3964](https://github.com/CapSoftware/Cap/pull/3964) | In smg ([#12](https://github.com/Solomedia/cap/pull/12)), PR open upstream | `packages/database/auth/auth-options.ts`, `apps/web/app/(org)/login/form.tsx` |

Type A: upstream-able (`feat/*`). Type B: SMG-only (`internal/*`). States: `In smg`, `PR open`, `Merged upstream`, `Rejected upstream → SMG-only`.

Expand Down
Loading