Novice fd124e6d32 Merge main HEAD (segment 5) into sandboxed-agent-rebase ... Resolve 83 conflicts: 10 backend, 62 frontend, 11 config/lock files. Preserve sandbox/agent/collaboration features while adopting main's UI refactorings (Dialog/AlertDialog/Popover), model provider updates, and enterprise features. Made-with: Cursor		2026-03-23 14:20:06 +08:00
..
__tests__	Merge main HEAD (segment 5) into sandboxed-agent-rebase	2026-03-23 14:20:06 +08:00
hooks	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
app-card-skeleton.tsx	feat(web): add loading indicators for infinite scroll pagination (#31110)	2026-01-17 17:36:07 +08:00
app-card.tsx	Merge main HEAD (segment 5) into sandboxed-agent-rebase	2026-03-23 14:20:06 +08:00
empty.tsx	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
footer.tsx	Merge main HEAD (segment 5) into sandboxed-agent-rebase	2026-03-23 14:20:06 +08:00
import-from-marketplace-template-modal.tsx	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
index.tsx	Merge commit '657eeb65' into sandboxed-agent-rebase	2026-03-19 17:38:56 +08:00
list.tsx	Merge main HEAD (segment 5) into sandboxed-agent-rebase	2026-03-23 14:20:06 +08:00
new-app-card.tsx	Merge main HEAD (segment 5) into sandboxed-agent-rebase	2026-03-23 14:20:06 +08:00