Junyan Qin d92946e241 Merge remote-tracking branch 'origin/main' into deploy/dev ... # Conflicts: # api/core/app/entities/task_entities.py # api/core/llm_generator/llm_generator.py # api/core/llm_generator/output_parser/suggested_questions_after_answer.py # api/core/llm_generator/prompts.py # api/models/comment.py # api/services/workflow_event_snapshot_service.py # api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py # api/tests/unit_tests/core/llm_generator/test_llm_generator.py # api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service.py # eslint-suppressions.json # web/app/components/app/app-publisher/index.tsx # web/app/components/datasets/settings/permission-selector/index.tsx # web/app/components/plugins/plugin-page/plugin-tasks/__tests__/index.spec.tsx # web/app/components/workflow/block-selector/blocks.tsx # web/app/components/workflow/block-selector/main.tsx # web/i18n/ar-TN/app-debug.json # web/i18n/de-DE/app-debug.json # web/i18n/en-US/workflow.json # web/i18n/es-ES/app-debug.json # web/i18n/fa-IR/app-debug.json # web/i18n/fr-FR/app-debug.json # web/i18n/hi-IN/app-debug.json # web/i18n/id-ID/app-debug.json # web/i18n/it-IT/app-debug.json # web/i18n/ja-JP/app-debug.json # web/i18n/ko-KR/app-debug.json # web/i18n/nl-NL/app-debug.json # web/i18n/pl-PL/app-debug.json # web/i18n/pt-BR/app-debug.json # web/i18n/ro-RO/app-debug.json # web/i18n/ru-RU/app-debug.json # web/i18n/sl-SI/app-debug.json # web/i18n/th-TH/app-debug.json # web/i18n/tr-TR/app-debug.json # web/i18n/uk-UA/app-debug.json # web/i18n/vi-VN/app-debug.json # web/i18n/zh-Hans/workflow.json # web/i18n/zh-Hant/app-debug.json		2026-04-24 16:27:59 +08:00
..
__tests__	Merge remote-tracking branch 'origin/main' into deploy/dev	2026-04-24 16:27:59 +08:00
checklist	refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui (#35349)	2026-04-17 08:46:11 +00:00
chat-variable-button.tsx	refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui (#35349)	2026-04-17 08:46:11 +00:00
editing-title.tsx	feat: evaluation (#35353)	2026-04-17 16:37:21 +08:00
env-button.tsx	refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui (#35349)	2026-04-17 08:46:11 +00:00
global-variable-button.tsx	refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui (#35349)	2026-04-17 08:46:11 +00:00
header-in-normal.tsx	Merge branch 'main' into jzh	2026-04-16 11:48:48 +08:00
header-in-restoring.tsx	refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui (#35349)	2026-04-17 08:46:11 +00:00
header-in-view-history.tsx	refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui (#35349)	2026-04-17 08:46:11 +00:00
index.tsx	feat: evaluation (#35353)	2026-04-17 16:37:21 +08:00
online-users.tsx	fix: improve collaboration (#35309)	2026-04-23 07:37:05 +00:00
restoring-title.tsx	feat: evaluation (#35353)	2026-04-17 16:37:21 +08:00
run-and-history.tsx	feat(ui): scaffold @langgenius/dify-ui and migrate design tokens (#35256)	2026-04-15 13:11:20 +00:00
run-mode.tsx	refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui (#35349)	2026-04-17 08:46:11 +00:00
running-title.tsx	feat: evaluation (#35419)	2026-04-20 15:43:22 +08:00
scroll-to-selected-node-button.tsx	feat(ui): scaffold @langgenius/dify-ui and migrate design tokens (#35256)	2026-04-15 13:11:20 +00:00
test-run-menu-helpers.tsx	refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui (#35349)	2026-04-17 08:46:11 +00:00
test-run-menu.tsx	refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui (#35349)	2026-04-17 08:46:11 +00:00
undo-redo.tsx	feat: collaboration (#30781)	2026-04-16 02:21:04 +00:00
version-history-button.tsx	refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui (#35349)	2026-04-17 08:46:11 +00:00
view-history.tsx	refactor(web): continue replacing PortalToFollowElem with Popover components (#35431)	2026-04-21 02:44:52 +00:00
view-workflow-history.tsx	refactor(web): continue replacing PortalToFollowElem with Popover components (#35431)	2026-04-21 02:44:52 +00:00