pftom
821eeaf228
Merge branch 'main' into incredible-vessel
...
Resolve conflicts where main added the 'nanobanana' image provider
alongside this branch's 'remotion' video provider:
- apps/daemon/src/media-models.ts: keep both new providers
- apps/web/src/media/models.ts: keep both ids in MediaProviderId union
and both entries in MEDIA_PROVIDERS
- apps/web/src/components/NewProjectPanel.tsx: extend the surface
whitelist with both — image gets 'nanobanana', video keeps 'remotion'
2026-05-06 21:12:34 +08:00
..
2026-05-05 16:42:11 +08:00
2026-05-06 12:43:48 +08:00
2026-04-28 16:03:35 +08:00
2026-05-06 09:18:59 +08:00
2026-05-04 19:22:46 +08:00
2026-05-01 23:11:38 +08:00
2026-05-04 19:22:46 +08:00
2026-05-06 12:43:48 +08:00
2026-05-04 19:22:46 +08:00
2026-04-28 16:03:35 +08:00
2026-05-06 12:43:48 +08:00
2026-05-05 18:32:30 +08:00
2026-05-05 09:14:06 +08:00
2026-05-04 19:22:46 +08:00
2026-05-06 09:18:59 +08:00
2026-05-05 09:14:06 +08:00
2026-05-02 11:00:44 +08:00
2026-05-02 11:00:44 +08:00
2026-05-02 11:00:44 +08:00
2026-05-02 11:00:44 +08:00
2026-05-02 11:00:44 +08:00
2026-05-02 11:00:44 +08:00
2026-05-02 11:00:44 +08:00
2026-05-02 11:00:44 +08:00
2026-05-02 11:00:44 +08:00
2026-05-03 20:31:05 +08:00
2026-05-03 20:31:05 +08:00
2026-05-02 11:00:44 +08:00
2026-05-02 11:00:44 +08:00
2026-05-02 11:00:44 +08:00
2026-05-02 11:00:44 +08:00
2026-05-02 11:00:44 +08:00
2026-05-02 11:00:44 +08:00
2026-05-05 16:42:11 +08:00
2026-05-05 16:42:11 +08:00
2026-04-28 16:03:35 +08:00
2026-05-04 19:22:46 +08:00
2026-05-04 19:22:46 +08:00
2026-05-05 16:31:05 +08:00
2026-05-05 16:42:11 +08:00
2026-04-28 16:03:35 +08:00
2026-04-28 16:03:35 +08:00
2026-05-05 18:32:30 +08:00
2026-05-06 20:09:30 +08:00
2026-04-28 16:03:35 +08:00
2026-05-04 19:22:46 +08:00
2026-05-04 19:22:46 +08:00
2026-04-28 16:03:35 +08:00
2026-05-03 00:53:28 +08:00
2026-04-28 16:03:35 +08:00
2026-05-06 11:35:12 +08:00
2026-04-30 11:19:52 +08:00
2026-05-02 11:00:33 +08:00
2026-04-28 16:03:35 +08:00
2026-04-28 16:03:35 +08:00
2026-04-28 16:03:35 +08:00
2026-04-28 16:03:35 +08:00
2026-04-28 16:03:35 +08:00
2026-05-05 16:42:11 +08:00
2026-04-28 16:03:35 +08:00
2026-05-03 20:31:05 +08:00
2026-05-03 20:31:05 +08:00
2026-05-03 20:31:05 +08:00
2026-04-28 16:03:35 +08:00
2026-04-28 16:03:35 +08:00