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
hooks	Merge branch 'main' into jzh	2026-04-17 14:05:23 +08:00
app-card-skeleton.tsx	feat(web): add loading indicators for infinite scroll pagination (#31110)	2026-01-17 17:36:07 +08:00
app-card.tsx	refactor(web): unify app-shell bootstrap on TanStack Query + Next.js route conventions (#35394)	2026-04-20 02:52:08 +00:00
app-type-filter-shared.ts	chore(web): fix lint	2026-04-03 15:13:52 +08:00
app-type-filter.tsx	fix merge error	2026-04-20 13:46:31 +08:00
creators-filter.tsx	merge	2026-04-20 13:41:51 +08:00
empty.tsx	feat(web): empty list of snippet	2026-04-15 16:53:37 +08:00
footer.tsx	chore: auto fix for tailwind rules (#35332)	2026-04-16 17:11:06 +00:00
import-from-marketplace-template-modal.tsx	feat: marketplace and oauth fixes (#35509)	2026-04-24 07:53:14 +00:00
index.tsx	Merge remote-tracking branch 'origin/main' into deploy/dev	2026-04-24 16:27:59 +08:00
list.tsx	merge main	2026-04-20 18:00:24 +08:00
new-app-card.tsx	feat(ui): scaffold @langgenius/dify-ui and migrate design tokens (#35256)	2026-04-15 13:11:20 +00:00
studio-route-switch.tsx	fix(web): fix merge	2026-04-16 12:06:53 +08:00