|
|
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 |
|
|
|
5041d96bb1
|
Merge commit 'fb41b215' into sandboxed-agent-rebase
Made-with: Cursor
# Conflicts:
# .devcontainer/post_create_command.sh
# api/commands.py
# api/core/agent/cot_agent_runner.py
# api/core/agent/fc_agent_runner.py
# api/core/app/apps/workflow_app_runner.py
# api/core/app/entities/queue_entities.py
# api/core/app/entities/task_entities.py
# api/core/workflow/workflow_entry.py
# api/dify_graph/enums.py
# api/dify_graph/graph/graph.py
# api/dify_graph/graph_events/node.py
# api/dify_graph/model_runtime/entities/message_entities.py
# api/dify_graph/node_events/node.py
# api/dify_graph/nodes/agent/agent_node.py
# api/dify_graph/nodes/base/__init__.py
# api/dify_graph/nodes/base/entities.py
# api/dify_graph/nodes/base/node.py
# api/dify_graph/nodes/llm/entities.py
# api/dify_graph/nodes/llm/node.py
# api/dify_graph/nodes/tool/tool_node.py
# api/pyproject.toml
# api/uv.lock
# web/app/components/base/avatar/__tests__/index.spec.tsx
# web/app/components/base/avatar/index.tsx
# web/app/components/base/date-and-time-picker/time-picker/__tests__/index.spec.tsx
# web/app/components/base/file-uploader/file-from-link-or-local/index.tsx
# web/app/components/base/prompt-editor/index.tsx
# web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx
# web/app/components/header/account-dropdown/index.spec.tsx
# web/app/components/share/text-generation/index.tsx
# web/app/components/workflow/block-selector/tool/action-item.tsx
# web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx
# web/app/components/workflow/hooks/use-edges-interactions.ts
# web/app/components/workflow/hooks/use-nodes-interactions.ts
# web/app/components/workflow/index.tsx
# web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
# web/app/components/workflow/nodes/http/components/key-value/key-value-edit/index.tsx
# web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-item.tsx
# web/app/components/workflow/nodes/loop/use-interactions.ts
# web/contract/router.ts
# web/env.ts
# web/eslint-suppressions.json
# web/package.json
# web/pnpm-lock.yaml
|
2026-03-23 10:52:06 +08:00 |
|
|
|
ec0a01a568
|
chore(deps): bump the github-actions-dependencies group with 4 updates (#33485)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
2026-03-16 11:07:42 +09:00 |
|
|
|
a59c54b3e7
|
ci: update actions version, reuse workflow by composite action (#33177)
|
2026-03-09 23:44:17 +08:00 |
|
|
|
83c260ee4c
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
|
2026-02-09 17:00:56 +08:00 |
|
|
|
a1fc280102
|
feat: Human Input Node (#32060)
The frontend and backend implementation for the human input node.
Co-authored-by: twwu <twwu@dify.ai>
Co-authored-by: JzoNg <jzongcode@gmail.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: zhsama <torvalds@linux.do>
|
2026-02-09 14:57:23 +08:00 |
|
|
|
90fe9abab7
|
revert: revert human input relevant code (#31766)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-01-30 19:18:49 +08:00 |
|
|
|
03e3acfc71
|
feat(api): Human Input Node (backend part) (#31646)
The backend part of the human in the loop (HITL) feature and relevant architecture / workflow engine changes.
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: 盐粒 Yanli <yanli@dify.ai>
Co-authored-by: CrabSAMA <40541269+CrabSAMA@users.noreply.github.com>
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: yihong <zouzou0208@gmail.com>
Co-authored-by: Joel <iamjoel007@gmail.com>
|
2026-01-30 10:18:49 +08:00 |
|
|
|
b93e21f99f
|
feat: Add sourcemap build arg for web dev deployments
|
2026-01-29 15:43:56 +08:00 |
|
|
|
30821fd26c
|
chore: Update outdated GitHub Actions versions (#31114)
|
2026-01-16 17:56:55 +08:00 |
|
|
|
dfd2dd5c68
|
build: update github actions (#30106)
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
|
2025-12-29 11:26:34 +08:00 |
|
|
|
275a0f9ddd
|
chore(workflows): update deployment configurations for trigger dev (#26753)
|
2025-10-11 12:43:09 +08:00 |
|
|
|
2913d17fe2
|
ci: Add hotfix/** branches to build-push workflow triggers (#26129)
|
2025-09-23 18:48:02 +08:00 |
|
|
|
71d69e43cd
|
Align dev workflow branch triggers (#26029)
|
2025-09-22 11:56:28 +08:00 |
|
|
|
85cda47c70
|
feat: knowledge pipeline (#25360)
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: twwu <twwu@dify.ai>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: jyong <718720800@qq.com>
Co-authored-by: Wu Tianwei <30284043+WTW0313@users.noreply.github.com>
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
Co-authored-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: quicksand <quicksandzn@gmail.com>
Co-authored-by: Jyong <76649700+JohnJyong@users.noreply.github.com>
Co-authored-by: lyzno1 <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: zxhlyh <jasonapring2015@outlook.com>
Co-authored-by: Yongtao Huang <yongtaoh2022@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: nite-knite <nkCoding@gmail.com>
Co-authored-by: Hanqing Zhao <sherry9277@gmail.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Harry <xh001x@hotmail.com>
|
2025-09-18 12:49:10 +08:00 |
|
|
|
52050d3dff
|
feat(workflow): add support for release/e-* tag in build-push workflow (#23418)
|
2025-08-05 16:42:07 +08:00 |
|
|
|
a4ef900916
|
Support OAuth Integration for Plugin Tools (#22550)
Co-authored-by: zxhlyh <jasonapring2015@outlook.com>
Co-authored-by: Yeuoly <admin@srmxy.cn>
|
2025-07-17 17:18:44 +08:00 |
|
|
|
2c2efe2e1e
|
chore(*): bump version to 1.2.0 (#17675)
Signed-off-by: -LAN- <laipz8200@outlook.com>
|
2025-04-09 17:12:40 +08:00 |
|
|
|
d1801b1f2e
|
Feat：edu frontend (#17251)
Co-authored-by: crazywoola <427733928@qq.com>
Co-authored-by: zxhlyh <jasonapring2015@outlook.com>
|
2025-04-01 13:58:10 +08:00 |
|
|
|
058d9c3525
|
chore: update release trigger to include all tags in build-push workflow (#16631)
Signed-off-by: -LAN- <laipz8200@outlook.com>
|
2025-03-24 17:17:55 +08:00 |
|
|
|
5e035a4209
|
Ci/deploy enterprise (#15699)
|
2025-03-13 02:22:21 -04:00 |
|
|
|
9f3fc7ebf8
|
ci: make ci safe using zizmor (#13397)
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
|
2025-02-10 12:26:08 +08:00 |
|
|
|
6692e8c508
|
build: update docker login action (#10050)
|
2024-10-31 09:53:45 +08:00 |
|
|
|
4ec977eaba
|
fix(workflow): update tagging logic in GitHub Actions (#8882)
|
2024-09-29 16:12:42 +08:00 |
|
|
|
7ed4e963aa
|
chore(action): move docker login above Set up QEMU in build-push action workflow (#6073)
|
2024-07-08 18:32:29 +08:00 |
|
|
|
27f0ae8416
|
build: support Poetry for depencencies tool in api's Dockerfile (#5105)
Co-authored-by: takatost <takatost@gmail.com>
|
2024-06-22 01:34:08 +08:00 |
|
|
|
9ed21737d5
|
fix: add repo check for build-push.yml (#5141)
|
2024-06-14 19:15:27 +08:00 |
|
|
|
a33b774314
|
fix: latest image tag not push in GitHub action (#3213)
|
2024-04-09 14:35:39 +08:00 |
|
|
|
7753ba2d37
|
FEAT: NEW WORKFLOW ENGINE (#3160)
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: Yeuoly <admin@srmxy.cn>
Co-authored-by: JzoNg <jzongcode@gmail.com>
Co-authored-by: StyleZhang <jasonapring2015@outlook.com>
Co-authored-by: jyong <jyong@dify.ai>
Co-authored-by: nite-knite <nkCoding@gmail.com>
Co-authored-by: jyong <718720800@qq.com>
|
2024-04-08 18:51:46 +08:00 |
|
|
|
15a6d94953
|
Refactor: Streamline the build-push and deploy-dev workflow (#2852)
|
2024-03-17 14:20:34 +08:00 |
|
