Commit Graph

159 Commits

Author SHA1 Message Date
yyh
9b1c147b5f Revert "Merge branch 'chore/upgrade-xyflow-v12' into deploy/dev"
This reverts commit 7e7f23334b, reversing
changes made to 96bfbe3bbb.
2026-05-14 11:14:49 +08:00
yyh
7e7f23334b Merge branch 'chore/upgrade-xyflow-v12' into deploy/dev
# Conflicts:
#	web/app/components/workflow-app/components/workflow-header/features-trigger.tsx
#	web/app/components/workflow/block-selector/blocks.tsx
#	web/app/components/workflow/nodes/human-input/components/form-content.tsx
#	web/app/components/workflow/panel/debug-and-preview/hooks.ts
2026-05-14 10:49:52 +08:00
yyh
6ba0a14a1a chore: update reactflow 2026-05-14 10:21:51 +08:00
JzoNg
19eb783341 merge hitl 2026-05-13 14:55:44 +08:00
Copilot
c34fc429ae fix: use Trans component for delete app confirmation text on editing page (#36092)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
2026-05-13 06:08:59 +00:00
JzoNg
7e9222c10f merge hitl 2026-05-12 15:54:34 +08:00
Coding On Star
8581a68174 refactor(web): drop headless-ui, migrate overlay to dify-ui (#35963)
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
2026-05-09 10:33:25 +00:00
JzoNg
a6994cc680 merge hitl 2026-05-09 13:09:54 +08:00
Joel
af754f497a chore: add query generator before lauch webapp (#35416)
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
2026-05-08 09:49:43 +00:00
yyh
03e227f8f1 fix(web): align Tailwind v4 CSS migration (#35829)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-06 06:20:28 +00:00
yyh
87f87bc4a8 Merge branch 'feat/css-first' into deploy/dev
# Conflicts:
#	eslint-suppressions.json
#	web/app/components/datasets/create/step-two/components/__tests__/inputs.spec.tsx
#	web/app/components/workflow/selection-contextmenu.tsx
2026-05-05 12:10:26 +08:00
yyh
1359c03216 refactor(web): migrate legacy tooltip to infotip (#35774)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-04 13:17:09 +00:00
yyh
e4cf7f1c18 Merge branch 'codex/select' into deploy/dev 2026-04-30 14:17:28 +08:00
yyh
11c52e90f6 refactor(web/select): base selects to dify-ui (#35720)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-30 06:15:08 +00:00
yyh
d6641a370e refactor(web): use typed error toast 2026-04-30 13:54:06 +08:00
yyh
21d2671c34 fix(web): preserve dropdown error messages 2026-04-30 13:48:26 +08:00
yyh
4e94683fd4 fix: native button 2026-04-30 13:25:27 +08:00
JzoNg
fcd2b5fef4 merge evaluation fe 2026-04-28 16:38:51 +08:00
JzoNg
c574363cf6 chore(web): remove unused data 2026-04-28 16:34:00 +08:00
JzoNg
5263a65ed6 Merge branch 'main' into jzh 2026-04-24 17:52:27 +08:00
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
非法操作
38e831c1b3 fix: improve note node (#35461) 2026-04-23 08:54:56 +00:00
JzoNg
93fa6e7749 Merge branch 'jzh' into deploy/dev 2026-04-20 18:02:31 +08:00
JzoNg
689571df22 Merge branch 'main' into jzh 2026-04-20 18:01:17 +08:00
JzoNg
89200fc1ce merge main 2026-04-20 18:00:24 +08:00
Joel
3cd6ef4464 chore: export dsl add loading (#35427) 2026-04-20 08:47:15 +00:00
JzoNg
bcd87ddc58 fix: publish as evaluation 2026-04-20 16:24:53 +08:00
FFXN
83743d5af0 feat: evaluation (#35419)
Co-authored-by: jyong <718720800@qq.com>
Co-authored-by: Yansong Zhang <916125788@qq.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: hj24 <mambahj24@gmail.com>
Co-authored-by: hj24 <huangjian@dify.ai>
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
2026-04-20 15:43:22 +08:00
JzoNg
bd136cadce fix: evaluation switch button 2026-04-20 14:37:13 +08:00
Joel
3de8151a7a fix: path 2026-04-20 13:50:25 +08:00
Joel
3bb3670cb5 merge 2026-04-20 13:41:51 +08:00
JzoNg
76c0aed05c fix merge error 2026-04-20 11:58:17 +08:00
Joel
103ba6ae3b mrege 2026-04-20 10:39:37 +08:00
JzoNg
b91727b804 Merge branch 'main' into jzh 2026-04-20 10:23:09 +08:00
yyh
dfcc0f8863 refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui (#35349)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-17 08:46:11 +00:00
JzoNg
364c0eb6e2 Merge branch 'main' into jzh 2026-04-17 14:57:13 +08:00
JzoNg
38736c154b Merge branch 'main' into jzh 2026-04-17 14:05:23 +08:00
Coding On Star
b6c7581a31 refactor(web): replace portal component with DropdownMenu in various components (#35319)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jerryzai <jerryzh8710@protonmail.com>
Co-authored-by: NVIDIAN <speedy.hpc@hotmail.com>
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
Co-authored-by: Junghwan <70629228+shaun0927@users.noreply.github.com>
Co-authored-by: HeYinKazune <70251095+HeYin-OS@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-04-17 05:53:51 +00:00
Stephen Zhou
6ca066983d chore: auto fix for tailwind rules (#35332)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-16 17:11:06 +00:00
Stephen Zhou
abb84f1c38 chore: enable noUncheckedIndexedAccess (#35178) 2026-04-16 13:01:35 +00:00
Joel
6978767f56 feat: workflow support get params from url and add set url config modal 2026-04-16 16:56:06 +08:00
JzoNg
7aa700bf2b fix(web): fix merge 2026-04-16 12:06:53 +08:00
JzoNg
0d47750b15 Merge branch 'main' into jzh 2026-04-16 11:48:48 +08:00
非法操作
53a22aa41b feat: collaboration (#30781)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
2026-04-16 02:21:04 +00:00
yyh
af7d5e60b4 feat(ui): scaffold @langgenius/dify-ui and migrate design tokens (#35256)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-15 13:11:20 +00:00
JzoNg
e6e063138e Merge branch 'main' into jzh 2026-04-15 10:20:27 +08:00
Coding On Star
2c58b424a1 refactor(web): migrate confirm dialogs to base/ui/alert-dialog (#35127)
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
2026-04-14 14:46:26 +00:00
yyh
e1bbe57f9c refactor(web): re-design button api (#35166)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-14 13:22:23 +00:00
JzoNg
0438285277 Merge branch 'main' into jzh 2026-04-09 19:24:10 +08:00
Coding On Star
1ce6e279f0 test: add unit tests for AppPublisher, Sidebar, Chat, FileUploader, Form Demo, Notion Page Selector, Prompt Editor, and Header Navigation components (#34802)
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
2026-04-09 07:30:51 +00:00