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
..
(commonLayout)	Merge remote-tracking branch 'origin/main' into deploy/dev	2026-04-24 16:27:59 +08:00
(humanInputLayout)/form/[token]	refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui (#35349)	2026-04-17 08:46:11 +00:00
(shareLayout)	refactor(web): unify app-shell bootstrap on TanStack Query + Next.js route conventions (#35394)	2026-04-20 02:52:08 +00:00
account	feat: marketplace and oauth fixes (#35509)	2026-04-24 07:53:14 +00:00
activate	refactor(web): unify app-shell bootstrap on TanStack Query + Next.js route conventions (#35394)	2026-04-20 02:52:08 +00:00
components	Merge remote-tracking branch 'origin/main' into deploy/dev	2026-04-24 16:27:59 +08:00
education-apply	refactor: migrate from PortalToFollowElem to Popover component across various components (#35454)	2026-04-21 10:09:22 +00:00
forgot-password	refactor(web): unify app-shell bootstrap on TanStack Query + Next.js route conventions (#35394)	2026-04-20 02:52:08 +00:00
init	refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui (#35349)	2026-04-17 08:46:11 +00:00
install	refactor(web): unify app-shell bootstrap on TanStack Query + Next.js route conventions (#35394)	2026-04-20 02:52:08 +00:00
oauth-callback	feat: the frontend part of mcp (#22131)	2025-07-10 14:14:02 +08:00
reset-password	refactor(web): unify app-shell bootstrap on TanStack Query + Next.js route conventions (#35394)	2026-04-20 02:52:08 +00:00
signin	feat: marketplace and oauth fixes (#35509)	2026-04-24 07:53:14 +00:00
signup	refactor(web): unify app-shell bootstrap on TanStack Query + Next.js route conventions (#35394)	2026-04-20 02:52:08 +00:00
styles	feat(ui): scaffold @langgenius/dify-ui and migrate design tokens (#35256)	2026-04-15 13:11:20 +00:00
layout.tsx	feat(amplitude): integrate AmplitudeProvider and refactor initialization logic (#35415)	2026-04-20 07:25:49 +00:00
loading.tsx	refactor(web): unify app-shell bootstrap on TanStack Query + Next.js route conventions (#35394)	2026-04-20 02:52:08 +00:00
page.tsx	feat: marketplace and oauth fixes (#35509)	2026-04-24 07:53:14 +00:00
routePrefixHandle.tsx	refactor: route next/navigation through compat re-export (#33636)	2026-03-18 12:57:03 +08:00