dify/web/app/education-apply
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
..
constants.ts refactor(query-state): migrate query param state management to nuqs (#30184) 2025-12-29 11:24:54 +08:00
education-apply-page.tsx Merge commit '92bde350' into sandboxed-agent-rebase 2026-03-23 09:39:49 +08:00
expire-notice-modal.tsx Merge main HEAD (segment 5) into sandboxed-agent-rebase 2026-03-23 14:20:06 +08:00
hooks.ts refactor: route next/navigation through compat re-export (#33636) 2026-03-18 12:57:03 +08:00
role-selector.tsx Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox 2026-02-09 18:43:04 +08:00
search-input.tsx Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox 2026-02-09 18:43:04 +08:00
types.ts Feat:edu frontend (#17251) 2025-04-01 13:58:10 +08:00
user-info.tsx Merge main HEAD (segment 5) into sandboxed-agent-rebase 2026-03-23 14:20:06 +08:00
verify-state-modal.tsx Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox 2026-02-09 18:43:04 +08:00