dify/web/app
Novice 8775003732
Merge branch 'main' into sandboxed-agent-rebase
Made-with: Cursor

# Conflicts:
#	api/tests/unit_tests/controllers/console/app/test_message.py
#	api/tests/unit_tests/controllers/console/app/test_statistic.py
#	api/tests/unit_tests/controllers/console/app/test_workflow_draft_variable.py
#	api/tests/unit_tests/controllers/console/auth/test_data_source_bearer_auth.py
#	api/tests/unit_tests/controllers/console/auth/test_data_source_oauth.py
#	api/tests/unit_tests/controllers/console/auth/test_oauth_server.py
#	web/app/components/header/account-setting/data-source-page/data-source-notion/operate/index.tsx
#	web/app/components/header/account-setting/data-source-page/data-source-website/config-firecrawl-modal.tsx
#	web/app/components/header/account-setting/data-source-page/data-source-website/config-jina-reader-modal.tsx
#	web/app/components/header/account-setting/data-source-page/data-source-website/config-watercrawl-modal.tsx
#	web/app/components/header/account-setting/data-source-page/panel/config-item.tsx
#	web/app/components/header/account-setting/data-source-page/panel/index.tsx
#	web/app/components/workflow/nodes/knowledge-retrieval/node.tsx
#	web/package.json
#	web/pnpm-lock.yaml
2026-03-24 11:19:50 +08:00
..
(commonLayout) Merge main HEAD (segment 5) into sandboxed-agent-rebase 2026-03-23 14:20:06 +08:00
(humanInputLayout)/form/[token] Merge main HEAD (segment 5) into sandboxed-agent-rebase 2026-03-23 14:20:06 +08:00
(shareLayout) Merge main HEAD (segment 5) into sandboxed-agent-rebase 2026-03-23 14:20:06 +08:00
account fix: pass all CI quality checks - ESLint, TypeScript, basedpyright, pyrefly, lint-imports 2026-03-24 10:54:58 +08:00
activate refactor: route next/navigation through compat re-export (#33636) 2026-03-18 12:57:03 +08:00
components Merge branch 'main' into sandboxed-agent-rebase 2026-03-24 11:19:50 +08:00
education-apply Merge main HEAD (segment 5) into sandboxed-agent-rebase 2026-03-23 14:20:06 +08:00
forgot-password refactor(web): update frontend toast call sites to use the new shortcut API (#33808) 2026-03-20 16:02:22 +08:00
init refactor: route next/navigation through compat re-export (#33636) 2026-03-18 12:57:03 +08:00
install refactor: route next/navigation through compat re-export (#33636) 2026-03-18 12:57:03 +08:00
oauth-callback
repos/[owner]/[repo]/releases refactor: route low-cost next modules through compat re-exports (#33622) 2026-03-18 10:37:29 +08:00
reset-password Merge main HEAD (segment 5) into sandboxed-agent-rebase 2026-03-23 14:20:06 +08:00
signin Merge main HEAD (segment 5) into sandboxed-agent-rebase 2026-03-23 14:20:06 +08:00
signup Merge main HEAD (segment 5) into sandboxed-agent-rebase 2026-03-23 14:20:06 +08:00
styles chore: add dev proxy server, update deps (#33371) 2026-03-13 12:52:19 +08:00
layout.tsx refactor: route low-cost next modules through compat re-exports (#33622) 2026-03-18 10:37:29 +08:00
page.spec.tsx fix: pass all CI quality checks - ESLint, TypeScript, basedpyright, pyrefly, lint-imports 2026-03-24 10:54:58 +08:00
page.tsx fix: pass all CI quality checks - ESLint, TypeScript, basedpyright, pyrefly, lint-imports 2026-03-24 10:54:58 +08:00
routePrefixHandle.tsx refactor: route next/navigation through compat re-export (#33636) 2026-03-18 12:57:03 +08:00