Stephen Zhou
45bee40955
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/controllers/console/datasets/datasets.py
# api/tests/unit_tests/controllers/console/datasets/test_datasets.py
2026-09-02 21:56:53 +08:00
Wu Tianwei
82d86dcf98
feat: app access point permission ( #41631 )
...
Co-authored-by: fatelei <fatelei@gmail.com>
2026-09-02 06:34:33 +00:00
Stephen Zhou
cd7e1be7cb
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/services/feature_service.py
# api/tests/unit_tests/controllers/console/workspace/test_members.py
# api/tests/unit_tests/core/workflow/nodes/agent_v2/test_validators.py
# api/tests/unit_tests/services/test_system_feature_service_knowledge_fs.py
# pnpm-lock.yaml
2026-09-02 10:31:10 +08:00
Joel
5cbc42cd38
chore: Revert "feat: use app.acl.access_point_manage to control access point page access" ( #41563 )
2026-09-01 03:46:03 +00:00
Stephen Zhou
ecd41aed3f
Merge remote-tracking branch 'origin/main' into deploy/konwledge
2026-09-01 09:45:49 +08:00
Wu Tianwei
7167d7d662
fix(rbac): grant agent access to all legacy roles ( #41511 )
2026-08-31 03:33:09 +00:00
wangxiaolei
6a00c23e49
feat: use app.acl.access_point_manage to control access point page access ( #41462 )
...
Co-authored-by: twwu <twwu@dify.ai>
2026-08-31 03:05:19 +00:00
Xiyuan Chen
750810ea81
fix(api): keep workspace owner consistent on ownership transfer ( #41267 )
2026-08-31 02:51:19 +00:00
Stephen Zhou
9098955a77
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/tests/unit_tests/controllers/console/test_knowledge_fs_proxy.py
# api/tests/unit_tests/services/test_knowledge_fs_proxy.py
# web/app/components/workflow-app/hooks/use-available-nodes-meta-data.ts
2026-08-28 14:50:39 +08:00
wangxiaolei
d84088ef74
feat: new user add automatic add to app / dataset whitelist ( #41363 )
2026-08-27 08:51:05 +00:00
Stephen Zhou
30ed0907f3
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/controllers/console/app/site.py
# api/controllers/console/datasets/datasets.py
# api/core/plugin/backwards_invocation/model.py
# api/core/rag/rerank/rerank_model.py
# api/tests/test_containers_integration_tests/controllers/console/auth/test_oauth_server.py
# api/tests/unit_tests/core/plugin/test_backwards_invocation_model.py
# api/tests/unit_tests/tasks/test_batch_clean_document_task.py
# packages/contracts/generated/api/service/orpc.gen.ts
# web/app/components/datasets/rename-modal/index.tsx
# web/app/components/header/account-setting/model-provider-page/model-selector/popup-layout.tsx
# web/features/tag-management/components/tag-search-content.tsx
2026-08-27 10:06:48 +08:00
wangxiaolei
0047522b0d
feat: add command cli to migration rbac scope to automatic_include_workspace_members ( #41304 )
2026-08-26 09:10:22 +00:00
FFXN
18155535cf
refactor(knowledge_fs): replace credential service with dataset API key authorization. Remove the API token feature at the space level for knowledgeFs.
2026-08-26 15:40:18 +08:00
Wu Tianwei
73dd8739ef
feat: optimize resource access config logic ( #41164 )
...
Co-authored-by: fatelei <fatelei@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-08-26 07:18:57 +00:00
wangxiaolei
0024a845f7
feat: support agent skill ( #39675 )
...
Signed-off-by: kenwoodjw <blackxin55+@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: zxhlyh <jasonapring2015@outlook.com>
Co-authored-by: 起岚 <155608604+xiaoyaoqilan@users.noreply.github.com>
Co-authored-by: Parman Mohammadalizadeh <prmma23@gmail.com>
Co-authored-by: Escape0707 <tothesong@gmail.com>
Co-authored-by: Xin Zhang <zhangxin@dify.ai>
Co-authored-by: iridescentWen <66297467+iridescentWen@users.noreply.github.com>
Co-authored-by: Bond Zhu <37842169+MRZHUH@users.noreply.github.com>
Co-authored-by: KVOJJJin <jzongcode@gmail.com>
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: 非法操作 <hjlarry@163.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
Co-authored-by: Chester <superdiao6@gmail.com>
Co-authored-by: WH-2099 <wh2099@pm.me>
Co-authored-by: Jony <619963502@qq.com>
Co-authored-by: Jony <13896935+zyz619963502zyz@users.noreply.github.com>
Co-authored-by: Harsh Kashyap <harsh.kashyap2001@gmail.com>
Co-authored-by: Harsh Kashyap <Harsh23Kashyap@users.noreply.github.com>
Co-authored-by: kenwoodjw <blackxin55+@gmail.com>
Co-authored-by: csurong <csurong1@gmail.com>
Co-authored-by: caosurong <surong.cao@thinkingdata.cn>
Co-authored-by: Taranum Wasu <81034301+Taranum01@users.noreply.github.com>
Co-authored-by: Taranum01 <50813317+Taranum01@users.noreply.github.com>
Co-authored-by: Pranav Agarwal <agarwalpranav0711@gmail.com>
Co-authored-by: Stephen Zhou <hi@hyoban.cc>
Co-authored-by: zl86790 <marshal_li_b@163.com>
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
Co-authored-by: yunlu.wen <yunlu.wen@dify.ai>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
2026-08-24 05:29:14 +00:00
Stephen Zhou
0564b75187
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/tests/unit_tests/commands/test_generate_swagger_specs.py
# api/tests/unit_tests/controllers/console/app/test_agent_manage_guard.py
# api/tests/unit_tests/extensions/test_ext_login.py
# packages/dify-ui/src/alert-dialog/index.tsx
# web/app/components/datasets/external-api/external-api-modal/index.tsx
# web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx
# web/features/new-rag/document-list.tsx
# web/features/new-rag/sources-page.tsx
2026-08-24 11:03:38 +08:00
Byron.wang
3b05b5e553
refactor(api): move account lifecycle into application services ( #40438 )
2026-08-21 08:05:43 +00:00
Stephen Zhou
db8c40b23e
Merge remote-tracking branch 'origin/main' into deploy/konwledge
2026-08-20 10:11:26 +08:00
非法操作
532489babd
refactor(api): extract web app access queries ( #40482 )
2026-08-19 10:34:36 +00:00
Stephen Zhou
c259666e69
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/core/plugin/backwards_invocation/model.py
# web/features/deployments/shared/components/unsupported-dsl-nodes-alert.tsx
2026-08-13 10:22:32 +08:00
Xin Zhang
0ee89c1302
fix: restrict app deploy to explicit enterprise permission ( #40564 )
2026-08-12 06:25:05 +00:00
Stephen Zhou
574461604d
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/commands/system.py
# api/controllers/console/init_validate.py
# api/controllers/console/workspace/account.py
# api/controllers/console/wraps.py
# api/controllers/openapi/auth/data.py
# api/core/hosting_configuration.py
# api/core/provider_manager.py
# api/core/rag/retrieval/dataset_retrieval.py
# api/services/workspace_service.py
# api/tasks/workflow_cfs_scheduler/entities.py
# api/tests/test_containers_integration_tests/controllers/console/auth/test_password_reset.py
# api/tests/test_containers_integration_tests/services/test_feature_service.py
# api/tests/unit_tests/controllers/console/auth/test_account_activation.py
# api/tests/unit_tests/controllers/openapi/auth/test_data.py
# api/tests/unit_tests/controllers/service_api/app/test_hitl_service_api.py
# api/tests/unit_tests/extensions/otel/test_retrieval_tracing.py
# api/tests/unit_tests/services/test_feature_service_knowledge_fs.py
# dev/start-worker
# packages/contracts/console.ts
# packages/contracts/package.json
# packages/iconify-collections/custom-public/icons.json
# web/app/components/workflow/__tests__/index.spec.tsx
# web/app/components/workflow/index.tsx
# web/features/new-rag/document-chunk-tree.tsx
# web/service/fetch.spec.ts
2026-08-12 10:33:29 +08:00
Wu Tianwei
7aba539e82
feat: app deployment v2 ( #39829 )
...
Co-authored-by: zhangx1n <zhangxin@dify.ai>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-08-12 01:55:36 +00:00
Byron.wang
c1e94f8ee7
refactor(api): consolidate deployment edition handling ( #40142 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-08-11 07:39:01 +00:00
Stephen Zhou
fde800e337
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# .github/dependabot.yml
# .github/workflows/deploy-dev.yml
# api/app_factory.py
# api/core/indexing_runner.py
# api/services/feature_service.py
# api/tests/test_containers_integration_tests/controllers/console/auth/test_password_reset.py
# api/tests/test_containers_integration_tests/services/test_feature_service.py
# api/tests/unit_tests/controllers/console/auth/test_account_activation.py
# api/tests/unit_tests/controllers/service_api/app/test_conversation.py
# api/tests/unit_tests/controllers/web/test_site.py
# api/tests/unit_tests/core/rag/indexing/test_indexing_runner.py
# api/tests/unit_tests/core/tools/test_base_tool.py
# api/tests/unit_tests/extensions/otel/test_retrieval_tracing.py
# api/tests/unit_tests/extensions/test_ext_login.py
# api/tests/unit_tests/services/test_feature_service_deployment_edition.py
# api/tests/unit_tests/services/test_feature_service_knowledge_fs.py
# api/tests/unit_tests/services/test_feature_service_licensed_seats.py
2026-08-07 09:55:10 +08:00
Byron.wang
b76a14d71d
refactor(api): decouple console queries through application services ( #40031 )
2026-08-07 00:42:55 +00:00
wangxiaolei
5bceac05eb
fix: get role and list role need filter billing permission key ( #38218 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-08-06 06:37:52 +00:00
Xiyuan Chen
b56ac4af4d
feat: gate agent management behind the agent.manage permission ( #39330 )
...
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-07-23 07:34:07 +00:00
Jyong
fc7fabe544
Merge branch 'codex/migrate-knowledge-fs' into deploy/konwledge
...
# Conflicts:
# api/tests/unit_tests/services/enterprise/test_rbac_service.py
# api/tests/unit_tests/services/test_agent_tool_inner_service.py
2026-07-22 06:16:29 -04:00
Jyong
29858d0db0
Expand application capabilities and refactor core workflows
2026-07-22 05:09:09 -04:00
Xiyuan Chen
3f0f57c594
fix: apply configured timeout to enterprise inner API requests ( #39335 )
2026-07-22 02:56:08 +00:00
yyh
fcc1d39f5e
fix(web): restore billing access boundary ( #39343 )
2026-07-21 05:35:36 +00:00
wangxiaolei
c278148c8f
feat: when knowledge permission is all team need update rbac setttings ( #38911 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-07-14 09:07:33 +00:00
wangxiaolei
7e05f28a46
feat: create app init rbac scope to all and add workspace members. ( #38636 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-07-10 09:31:41 +00:00
Asuka Minato
68d8328b9c
chore: clean Db session from service ( #38227 )
...
Co-authored-by: chariri <w@chariri.moe>
Co-authored-by: WH-2099 <wh2099@pm.me>
2026-07-08 03:07:27 +00:00
非法操作
faaa4708a6
fix: editor should not manage member ( #38503 )
2026-07-07 07:39:24 +00:00
Stephen Zhou
ee1d33eaa6
refactor(web): migrate rbac access console contracts ( #38256 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-07-01 14:45:34 +00:00
wangxiaolei
528bf95d1b
feat: support dataset permission migrate to rbac ( #38166 )
2026-06-30 06:43:46 +00:00
非法操作
fa1ac75922
fix: editor can view the logs ( #38165 )
2026-06-29 10:05:32 +00:00
Xiyuan Chen
0d5f43520c
fix(api): wire dedicated timeout into inner RBAC requests ( #38150 )
2026-06-29 07:03:50 +00:00
wangxiaolei
40119fef44
feat: update monitor permission key and plugin permission key ( #37937 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-25 09:41:38 +00:00
FFXN
8f74e176ca
fix: remove redundant snippets permissions ( #37921 )
...
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-06-25 07:27:16 +00:00
wangxiaolei
9fc2925b00
feat: delete member delete rbac binding ( #37904 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-25 02:08:07 +00:00
wangxiaolei
d87764b0f8
feat: filter dataset operator and add miss permission key ( #37867 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-24 09:56:28 +00:00
wangxiaolei
be3677f145
fix: fix logic ( #37812 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-23 10:11:52 +00:00
wangxiaolei
db9b899321
chore: compatiable old role update ( #37804 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-23 09:08:08 +00:00
wangxiaolei
56b0b57ff7
feat: support query catalog add billing enabled ( #37791 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-23 07:34:58 +00:00
wangxiaolei
ef54229d6f
chore: add ENTERPRISE_RBAC_API_URL check and update permission key ( #37777 )
2026-06-23 03:26:06 +00:00
wangxiaolei
c83dcce1f7
chore: remove duplicate code ( #37724 )
2026-06-22 06:57:56 +00:00
非法操作
7b3508e376
fix: add legacy snippet permissions ( #37718 )
2026-06-22 05:37:21 +00:00
