dify/web/app/(commonLayout)
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
..
app/(appDetailLayout) Merge remote-tracking branch 'origin/main' into deploy/dev 2026-04-24 16:27:59 +08:00
apps feat: convert components to dynamic imports for improved performance (#22614) 2025-07-18 11:43:37 +08:00
datasets fix(web): nav icons 2026-04-20 15:47:34 +08:00
education-apply refactor: route next/navigation through compat re-export (#33636) 2026-03-18 12:57:03 +08:00
explore refactor(i18n): use JSON with flattened key and namespace (#30114) 2025-12-29 14:52:32 +08:00
plugins refactor: marketplace state management (#30702) 2026-01-09 14:31:24 +08:00
snippets feat(web): billing for evaluation & snippets 2026-04-12 11:09:15 +08:00
tools refactor(web): centralize role-based route guards and fix anti-patterns (#32302) 2026-02-14 17:31:37 +08:00
error.tsx refactor(web): unify app-shell bootstrap on TanStack Query + Next.js route conventions (#35394) 2026-04-20 02:52:08 +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
role-route-guard.spec.tsx refactor: route next/navigation through compat re-export (#33636) 2026-03-18 12:57:03 +08:00
role-route-guard.tsx Merge branch 'main' into jzh 2026-03-18 17:40:51 +08:00