Novice
fd124e6d32
Merge main HEAD (segment 5) into sandboxed-agent-rebase
...
Resolve 83 conflicts: 10 backend, 62 frontend, 11 config/lock files.
Preserve sandbox/agent/collaboration features while adopting main's
UI refactorings (Dialog/AlertDialog/Popover), model provider updates,
and enterprise features.
Made-with: Cursor
2026-03-23 14:20:06 +08:00
Novice
94b01f6821
Merge commit '92bde350' into sandboxed-agent-rebase
...
Made-with: Cursor
# Conflicts:
# api/controllers/console/app/workflow_draft_variable.py
# api/core/agent/cot_agent_runner.py
# api/core/agent/cot_chat_agent_runner.py
# api/core/agent/cot_completion_agent_runner.py
# api/core/agent/fc_agent_runner.py
# api/core/app/apps/advanced_chat/app_generator.py
# api/core/app/apps/advanced_chat/app_runner.py
# api/core/app/apps/agent_chat/app_runner.py
# api/core/app/apps/workflow/app_generator.py
# api/core/app/apps/workflow/app_runner.py
# api/core/app/entities/app_invoke_entities.py
# api/core/app/entities/queue_entities.py
# api/core/llm_generator/output_parser/structured_output.py
# api/core/workflow/workflow_entry.py
# api/dify_graph/context/__init__.py
# api/dify_graph/entities/tool_entities.py
# api/dify_graph/file/file_manager.py
# api/dify_graph/graph_engine/response_coordinator/coordinator.py
# api/dify_graph/graph_events/node.py
# api/dify_graph/node_events/node.py
# api/dify_graph/nodes/agent/agent_node.py
# api/dify_graph/nodes/llm/entities.py
# api/dify_graph/nodes/llm/llm_utils.py
# api/dify_graph/nodes/llm/node.py
# api/dify_graph/nodes/question_classifier/question_classifier_node.py
# api/dify_graph/runtime/graph_runtime_state.py
# api/dify_graph/variables/segments.py
# api/factories/variable_factory.py
# api/services/variable_truncator.py
# api/tests/unit_tests/utils/structured_output_parser/test_structured_output_parser.py
# api/uv.lock
# web/app/components/app-sidebar/app-info.tsx
# web/app/components/app-sidebar/app-sidebar-dropdown.tsx
# web/app/components/app/create-app-modal/index.spec.tsx
# web/app/components/apps/__tests__/list.spec.tsx
# web/app/components/apps/app-card.tsx
# web/app/components/apps/list.tsx
# web/app/components/header/account-dropdown/compliance.tsx
# web/app/components/header/account-dropdown/index.tsx
# web/app/components/header/account-dropdown/support.tsx
# web/app/components/workflow-app/components/workflow-onboarding-modal/index.tsx
# web/app/components/workflow/panel/debug-and-preview/hooks.ts
# web/contract/console/apps.ts
# web/contract/router.ts
# web/eslint-suppressions.json
# web/next.config.ts
# web/pnpm-lock.yaml
2026-03-23 09:39:49 +08:00
Novice
cccff6768a
Merge commit '9c339239' into sandboxed-agent-rebase
...
Made-with: Cursor
# Conflicts:
# api/README.md
# api/controllers/console/app/workflow_draft_variable.py
# api/core/agent/cot_agent_runner.py
# api/core/agent/fc_agent_runner.py
# api/core/app/apps/advanced_chat/app_runner.py
# api/core/plugin/backwards_invocation/model.py
# api/core/prompt/advanced_prompt_transform.py
# api/core/workflow/nodes/base/node.py
# api/core/workflow/nodes/llm/llm_utils.py
# api/core/workflow/nodes/llm/node.py
# api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
# api/core/workflow/nodes/question_classifier/question_classifier_node.py
# api/core/workflow/runtime/graph_runtime_state.py
# api/extensions/storage/base_storage.py
# api/factories/variable_factory.py
# api/pyproject.toml
# api/services/variable_truncator.py
# api/uv.lock
# web/app/account/oauth/authorize/page.tsx
# web/app/components/app/configuration/config-var/config-modal/field.tsx
# web/app/components/base/alert.tsx
# web/app/components/base/chat/chat/answer/human-input-content/executed-action.tsx
# web/app/components/base/chat/chat/answer/more.tsx
# web/app/components/base/chat/chat/answer/operation.tsx
# web/app/components/base/chat/chat/answer/workflow-process.tsx
# web/app/components/base/chat/chat/citation/index.tsx
# web/app/components/base/chat/chat/citation/popup.tsx
# web/app/components/base/chat/chat/citation/progress-tooltip.tsx
# web/app/components/base/chat/chat/citation/tooltip.tsx
# web/app/components/base/chat/chat/question.tsx
# web/app/components/base/chat/embedded-chatbot/inputs-form/index.tsx
# web/app/components/base/chat/embedded-chatbot/inputs-form/view-form-dropdown.tsx
# web/app/components/base/markdown-blocks/form.tsx
# web/app/components/base/prompt-editor/plugins/hitl-input-block/component-ui.tsx
# web/app/components/base/tag-management/panel.tsx
# web/app/components/base/tag-management/trigger.tsx
# web/app/components/header/account-setting/index.tsx
# web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx
# web/app/components/header/account-setting/model-provider-page/provider-added-card/index.tsx
# web/app/signin/utils/post-login-redirect.ts
# web/eslint-suppressions.json
# web/package.json
# web/pnpm-lock.yaml
2026-03-23 09:00:45 +08:00
Bowen Liang and GitHub
942087cbdb
feat(confirm): input app name for app deletion confirmation ( #33660 )
2026-03-19 14:25:29 +08:00
yyh and GitHub
84dca83ecd
feat(web): add base AlertDialog with app-card migration example ( #32933 )
...
Signed-off-by: yyh <[email protected]
2026-03-04 13:56:27 +08:00
335b500aea
test: add unit tests for base components ( #32818 )
...
Co-authored-by: CodingOnStar <[email protected]
2026-03-02 11:40:43 +08:00
yyh
e730124740
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
...
# Conflicts:
# api/uv.lock
# web/app/components/apps/__tests__/app-card.spec.tsx
# web/app/components/apps/__tests__/list.spec.tsx
# web/app/components/datasets/create/__tests__/index.spec.tsx
# web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx
# web/app/components/plugins/readme-panel/__tests__/index.spec.tsx
# web/app/components/rag-pipeline/__tests__/index.spec.tsx
# web/app/components/rag-pipeline/hooks/__tests__/index.spec.ts
# web/eslint-suppressions.json
2026-02-13 15:17:52 +08:00
Saumya Talwani and GitHub
98466e2d29
test: add tests for some base components ( #32265 )
2026-02-13 14:29:04 +08:00
yyh
db0c527ce8
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
2026-02-09 18:43:04 +08:00
Stephen Zhou and GitHub
47d0e400ae
chore: update to story book nextjs-vite ( #31536 )
2026-01-26 17:07:20 +08:00
6d0e36479b
refactor(i18n): use JSON with flattened key and namespace ( #30114 )
...
Co-authored-by: yyh <[email protected]
2025-12-29 14:52:32 +08:00
Stephen Zhou and GitHub
403adefc07
chore: lint require and how to import react ( #30041 )
2025-12-23 18:02:10 +08:00
f2842da397
chore(web): new lint setup ( #30020 )
...
Co-authored-by: yyh <[email protected]
2025-12-23 16:58:55 +08:00
+4
b76e17b25d
feat: introduce trigger functionality ( #27644 )
...
Signed-off-by: lyzno1 <[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
2025-11-12 17:59:37 +08:00
f092bc1912
chore: add more stories ( #27403 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-10-29 14:33:43 +08:00
非法操作 and GitHub
b198c9474a
chore: improve storybooks ( #27306 )
2025-10-23 11:00:45 +08:00
GuanMu and GitHub
c61c2b0abd
Fix type error ( #27274 )
2025-10-22 17:08:27 +08:00
GuanMu and GitHub
c327cfa86e
fix(storybook): add required handler props and fix TypeScript errors in component stories ( #27187 )
2025-10-21 17:44:26 +08:00
非法操作 and GitHub
dc1a380888
chore: improve storybook ( #27111 )
2025-10-20 10:17:17 +08:00
7709d9df20
Chore: frontend infrastructure upgrade ( #16420 )
...
Co-authored-by: NFish <[email protected] [email protected] [email protected] [email protected]
2025-03-21 17:41:03 +08:00
诗浓 and GitHub
e796937d02
feat: add keyboard shortcuts support for dialog confirmation ( #15752 )
2025-03-13 21:42:53 +08:00
Yi Xiao and GitHub
34cab0e0b7
Fix: account delete function & confirm issues ( #7129 )
2024-08-09 11:37:34 +08:00
Yi Xiao and GitHub
0c22e4e3d1
Feat/new confirm ( #6984 )
2024-08-06 14:31:13 +08:00
Joel and GitHub
eff280f3e7
feat: tailwind related improvement ( #6085 )
2024-07-09 15:05:40 +08:00
zxhlyh and GitHub
5d4d65a85b
fix: button ( #5470 )
2024-06-21 14:17:45 +08:00
zxhlyh and GitHub
2328ed8ffa
feat: new icons ( #5412 )
2024-06-20 11:05:08 +08:00
a3bd5eba02
refactor: refactor the button component using forwardRef ( #4379 )
...
Co-authored-by: KVOJJJin <[email protected]
2024-06-19 14:13:16 +08:00
zxhlyh and GitHub
51d359268e
chore: replace chat in web app ( #2373 )
2024-02-04 16:10:46 +08:00
zxhlyh and GitHub
fc4c03640d
fix: provider delete api key modal z-index ( #1416 )
2023-10-26 10:35:03 +08:00
18c710c906
feat: support binding context var ( #1227 )
...
Co-authored-by: Joel <[email protected]
2023-09-27 14:53:22 +08:00
zxhlyh and GitHub
96d10c8b39
feat: spark free quota verify ( #1152 )
2023-09-11 17:30:54 +08:00
Joel and GitHub
9458b8978f
feat: siderbar operation support portal ( #1061 )
2023-08-31 17:46:51 +08:00
zxhlyh and GitHub
4f5f9506ab
Feat/pay modal ( #889 )
2023-08-17 15:49:22 +08:00
f95f6db0e3
feat: support app rename and make app card ui better ( #766 )
...
Co-authored-by: Gillian97 <[email protected]
2023-08-16 10:31:08 +08:00
d10ef17f17
feat: frontend multi models support ( #804 )
...
Co-authored-by: StyleZhang <[email protected] [email protected]
2023-08-12 00:57:13 +08:00
John Wang
db896255d6
Initial commit
2023-05-15 08:51:32 +08:00
Novice