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
..
cli_api	style: auto-format after segment 3 import migrations	2026-03-23 10:37:02 +08:00
common	refactor: move workflow package to dify_graph (#32844)	2026-03-02 18:42:30 +08:00
console	Merge branch 'main' into sandboxed-agent-rebase	2026-03-24 11:19:50 +08:00
files	Merge commit 'fb41b215' into sandboxed-agent-rebase	2026-03-23 10:52:06 +08:00
inner_api	Merge main HEAD (segment 5) into sandboxed-agent-rebase	2026-03-23 14:20:06 +08:00
mcp	refactor: replace remaining sa.String with EnumText 2 (#33448)	2026-03-14 20:20:30 +09:00
service_api	refactor: use EnumText for MessageFeedback and MessageFile columns (#33738)	2026-03-20 01:13:26 +09:00
trigger	fix: clarify webhook debug endpoint behavior (#33597)	2026-03-18 14:28:33 +08:00
web	refactor: migrate db.session.query to select in inner_api and web controllers (#33774)	2026-03-20 03:32:03 +09:00
__init__.py	chore(api/controllers): Apply Ruff Formatter. (#7645)	2024-08-26 15:29:10 +08:00
fastopenapi.py	feat: init fastopenapi (#30453)	2026-01-23 21:07:52 +09:00