yyh
9b1c147b5f
Revert "Merge branch 'chore/upgrade-xyflow-v12' into deploy/dev"
...
This reverts commit 7e7f23334b96bfbe3bbb
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
FFXN
2afa39cdcb
fix: knowledge hit-testing render failed. ( #36106 )
...
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com >
2026-05-13 07:31:38 +00:00
fatelei
f91c513315
feat: migrate role to rbac
2026-05-13 14:50:40 +08:00
fatelei
cb2dd5459e
fix: fix owner transfer
2026-05-13 14:12:23 +08:00
JzoNg
716ef45a50
merge hitl
2026-05-13 11:34:14 +08:00
JzoNg
070f8bcf14
Merge branch 'main' into tp
2026-05-13 11:15:58 +08:00
fatelei
8e6fddc714
chore: update legacy permission keys
2026-05-13 11:15:31 +08:00
Joel
680ef077ae
chore: admin also has the permission of changing role ( #36069 )
...
Co-authored-by: Yansong Zhang <916125788@qq.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-12 10:15:05 +00:00
JzoNg
0a05435b37
merge hitl
2026-05-12 18:12:09 +08:00
JzoNg
26c14fd58a
Merge branch 'main' into tp
2026-05-12 15:55:20 +08:00
JzoNg
7e9222c10f
merge hitl
2026-05-12 15:54:34 +08:00
QuantumGhost
17759c0b80
Merge remote-tracking branch 'upstream/main' into feat/hitl-form-enhancement
2026-05-12 15:04:10 +08:00
Asuka Minato
51a8f79d67
chore: DocumentSegment to Typebase ( #35635 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-12 07:02:17 +00:00
fatelei
d0185ebbef
feat: invite member support rbac
2026-05-12 13:36:46 +08:00
Deepam Goyal
1a93af5cd0
refactor: rewrite estimate_args_validate using Pydantic v2 models ( #36036 )
...
Signed-off-by: Deepam Goyal <deepam02goyal@gmail.com >
Co-authored-by: Asuka Minato <i@asukaminato.eu.org >
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com >
2026-05-12 05:34:45 +00:00
fatelei
cd2b623aee
fix: add miss name
2026-05-11 19:19:35 +08:00
fatelei
bbcb5bca92
fix: fixme
2026-05-11 18:50:00 +08:00
fatelei
a7efd92200
feat: list app and dataset permission keys
2026-05-11 16:26:58 +08:00
fatelei
a7f548648b
fix: fix permission key format and fix role return format
2026-05-11 14:08:37 +08:00
fatelei
f8fb011159
chore: compatiable without rbac
2026-05-11 13:34:38 +08:00
Blackoutta
0b70eec695
feat(human-input): expose selected action value ( #35451 )
2026-05-11 02:16:29 +00:00
Asuka Minato
7b5c371b9d
chore: api para type ( #35985 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-10 06:04:42 +00:00
fatelei
7051b574ce
feat: support role copy
2026-05-09 20:57:29 +08:00
fatelei
197f5cd03f
chore: compatiable result is none
2026-05-09 17:46:44 +08:00
-LAN-
19476109da
chore(api): upgrade graphon to v0.3.0 ( #35469 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: WH-2099 <wh2099@pm.me >
2026-05-09 07:30:03 +00:00
JzoNg
a6994cc680
merge hitl
2026-05-09 13:09:54 +08:00
JzoNg
3d445e1d95
Merge branch 'main' into tp
2026-05-09 12:03:24 +08:00
Asuka Minato
140ad6ba4e
chore: add Type to test ( #35942 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-09 03:16:22 +00:00
QuantumGhost
f1833fdb08
Merge remote-tracking branch 'upstream/feat/hitl-form-enhancement' into feat/hitl-form-enhancement
2026-05-09 10:04:43 +08:00
QuantumGhost
e099ba8679
test(api): add tests for delivery and file inputs
2026-05-09 02:13:37 +08:00
fatelei
e8a3771d53
chore: compatiable none list
2026-05-08 18:52:57 +08:00
JzoNg
c8d6ad117e
Merge branch 'main' into tp
2026-05-08 15:25:47 +08:00
非法操作
927a17804b
feat: support configurable explore app categories ( #35723 )
2026-05-08 06:04:07 +00:00
fatelei
8912420bff
refactor: refactor rbac api
2026-05-08 14:02:13 +08:00
JzoNg
f1adc60822
Merge branch 'main' into tp
2026-05-08 13:35:26 +08:00
Xiyuan Chen
29f34848cd
fix(tools): scope builtin tool default-credential clear to tenant ( #35887 )
2026-05-08 05:08:23 +00:00
QuantumGhost
ed98925f11
Merge remote-tracking branch 'upstream/feat/hitl-form-enhancement' into feat/hitl-form-enhancement
2026-05-08 11:44:37 +08:00
JzoNg
04ed797ac9
merge main
2026-05-08 10:22:35 +08:00
wangxiaolei
9216d74c61
refactor: refactor rbac backend implement ( #35900 )
...
Co-authored-by: twwu <twwu@dify.ai >
2026-05-08 00:04:54 +08:00
Escape0707
cd3327013a
chore(test): Move plugin permission tests to testcontainers ( #35884 )
2026-05-07 09:57:53 +00:00
QuantumGhost
3f6559dd60
Merge remote-tracking branch 'upstream/feat/hitl-form-enhancement' into feat/hitl-form-enhancement
2026-05-07 16:44:29 +08:00
JzoNg
c0bedd9118
Merge branch 'main' into tp
2026-05-07 14:18:50 +08:00
wangxiaolei
3a525a609c
feat: rbac service ( #35874 )
...
Co-authored-by: twwu <twwu@dify.ai >
2026-05-07 14:16:02 +08:00
Asuka Minato
8fd616d27f
refactor: add type to test ( #30873 )
...
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-07 03:46:23 +00:00
QuantumGhost
02e42fd66f
chore(api): update mock path in tests
2026-05-07 10:53:38 +08:00
QuantumGhost
a0f8db5516
test(api): add tests about file input file uploading api
2026-05-07 10:52:54 +08:00
JzoNg
21a9c8d59c
Merge branch 'main' into tp
2026-05-06 15:39:10 +08: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
JzoNg
64a60232cf
Merge branch 'jzh' into deploy/dev
2026-04-30 11:03:38 +08:00
