 fatelei
|
c0e67b4904
|
Merge branch 'rbac_command' into deploy/dev
# Conflicts:
# api/controllers/console/datasets/datasets.py
# api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py
# api/controllers/console/workspace/rbac.py
# api/services/enterprise/rbac_service.py
# api/tests/unit_tests/controllers/console/app/test_app_response_models.py
# api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
# api/tests/unit_tests/services/enterprise/test_rbac_service.py
# web/i18n/ar-TN/permission.json
# web/i18n/de-DE/permission.json
# web/i18n/en-US/permission.json
# web/i18n/es-ES/permission.json
# web/i18n/fa-IR/permission.json
# web/i18n/fr-FR/permission.json
# web/i18n/hi-IN/permission.json
# web/i18n/id-ID/permission.json
# web/i18n/it-IT/permission.json
# web/i18n/ja-JP/permission.json
# web/i18n/ko-KR/permission.json
# web/i18n/lo-LA/permission.json
# web/i18n/nl-NL/permission.json
# web/i18n/pl-PL/permission.json
# web/i18n/pt-BR/permission.json
# web/i18n/ro-RO/permission.json
# web/i18n/ru-RU/permission.json
# web/i18n/sl-SI/permission.json
# web/i18n/th-TH/permission.json
# web/i18n/tr-TR/permission.json
# web/i18n/uk-UA/permission.json
# web/i18n/vi-VN/permission.json
# web/i18n/zh-Hans/permission.json
# web/i18n/zh-Hant/permission.json
|
2026-08-26 16:46:13 +08:00 |
|
|
CodingOnStar
|
5b9e1a21c4
|
Merge branch 'feat/creator-profile-home' into deploy/dev
|
2026-08-26 15:34:23 +08:00 |
|
|
Byron.wang
|
30e6069851
|
refactor(api): thin OAuth controllers and extract application services (#40692)
|
2026-08-26 07:33:37 +00:00 |
|
|
CodingOnStar
|
e7e502d1e7
|
merge: bring origin/main into feat/creator-profile-home
|
2026-08-26 15:28:59 +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 |
|
|
非法操作
|
c563528a2d
|
refactor(api): standardize compliance downloads (#41057)
|
2026-08-26 06:32:13 +00:00 |
|
|
Stephen Zhou
|
1c6f0a0388
|
fix(api): restore Service API OpenAPI semantics (#41274)
|
2026-08-26 05:05:36 +00:00 |
|
|
Stephen Zhou
|
92016aa139
|
fix(api): align Service API OpenAPI contract (#41248)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-08-25 10:54:14 +00:00 |
|
|
wangxiaolei
|
a6fe278662
|
feat: hide add library skill in agent ui (#41250)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-08-25 10:26:06 +00:00 |
|
|
wangxiaolei
|
ddcdbb2d14
|
feat: add skill enable feature switch (#41246)
|
2026-08-25 08:42:15 +00:00 |
|
|
fatelei
|
1b21f4619c
|
fix: fix conflict
|
2026-08-25 15:00:58 +08:00 |
|
|
twwu
|
6d41d85a39
|
Merge branch 'main' into user_access_policy_pagnination
|
2026-08-25 14:37:54 +08:00 |
|
|
非法操作
|
f360a7bf94
|
fix: allow OAuth trigger builder verification without credentials (#39199)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-08-25 05:32:27 +00:00 |
|
|
CodingOnStar
|
5b52bafdad
|
Merge branch 'feat/creator-profile-home' into deploy/dev
|
2026-08-25 12:37:01 +08:00 |
|
|
CodingOnStar
|
ebe06c7eee
|
merge: bring origin/main into feat/creator-profile-home
|
2026-08-25 11:28:23 +08:00 |
|
|
非法操作
|
ef92cb7c65
|
refactor(api): complete account education boundary (#41153)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-08-25 01:48:12 +00:00 |
|
|
fatelei
|
6a34974126
|
Merge branch 'user_access_policy_pagnination' into deploy/dev
# Conflicts:
# api/controllers/console/tag/tags.py
# api/controllers/console/workspace/rbac.py
# api/controllers/console/workspace/skills.py
# api/openapi/markdown/console-openapi.md
# api/services/skill_management_service.py
# api/services/tag_service.py
# api/tests/unit_tests/controllers/console/tag/test_tags.py
# api/tests/unit_tests/controllers/console/workspace/test_skills.py
# api/tests/unit_tests/services/test_skill_management_service.py
# packages/contracts/generated/api/console/tags/types.gen.ts
# packages/contracts/generated/api/console/tags/zod.gen.ts
# packages/iconify-collections/custom-vender/info.json
# web/app/components/main-nav/__tests__/index.spec.tsx
# web/features/agent-v2/agent-detail/configure/components/orchestrate/index.tsx
# web/features/skills/__tests__/detail-page.spec.tsx
# web/features/skills/detail/skill-metadata.tsx
# web/i18n-config/__tests__/plural-selector.spec.ts
|
2026-08-24 16:05:00 +08:00 |
|
|
twwu
|
ea17aef26e
|
Merge branch 'main' into user_access_policy_pagnination
# Conflicts:
# packages/contracts/generated/api/console/workspaces/orpc.gen.ts
|
2026-08-24 15:23:21 +08:00 |
|
|
twwu
|
e28649d086
|
feat: enhance resource access management
|
2026-08-24 15:13:02 +08:00 |
|
|
林玮 (Jade Lin)
|
70a513fc62
|
fix(api): scope hosted credits by tenant plan (#41131)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-08-24 06:35:42 +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 |
|
|
CodingOnStar
|
e39a48394b
|
Merge branch 'feat/creator-profile-home' into deploy/dev
# Conflicts:
# api/controllers/console/tag/tags.py
# api/openapi/markdown/console-openapi.md
# api/services/app_service.py
# oxlint-suppressions.json
# packages/contracts/generated/api/console/tags/types.gen.ts
# packages/contracts/generated/api/console/tags/zod.gen.ts
|
2026-08-24 12:41:49 +08:00 |
|
|
CodingOnStar
|
e377dd0d91
|
merge: bring origin/main into feat/creator-profile-home
# Conflicts:
# api/controllers/console/tag/tags.py
# api/openapi/markdown/console-openapi.md
# api/services/app_service.py
# oxlint-suppressions.json
# packages/contracts/generated/api/console/tags/types.gen.ts
# packages/contracts/generated/api/console/tags/zod.gen.ts
# packages/contracts/generated/api/console/workspaces/orpc.gen.ts
|
2026-08-24 12:15:37 +08:00 |
|
|
AsperforMias
|
3f7e6cdcb4
|
fix(tts): propagate and validate actual audio MIME (#41043)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: WH-2099 <wh2099@pm.me>
|
2026-08-24 03:38:09 +00:00 |
|
|
fatelei
|
c9f036541f
|
fix: fix conflict
|
2026-08-24 10:36:13 +08:00 |
|
|
非法操作
|
ed45016475
|
refactor(api): standardize console billing portal errors (#41055)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-08-24 01:55:48 +00:00 |
|
|
zxhlyh
|
f5fc84f4ea
|
Merge branch 'skill' into deploy/dev
# Conflicts:
# api/services/recommend_app/remote/remote_retrieval.py
# oxlint-suppressions.json
# web/app/components/main-nav/routes.ts
|
2026-08-21 17:08:33 +08:00 |
|
|
autofix-ci[bot]
|
f0fbc6bb5b
|
[autofix.ci] apply automated fixes
|
2026-08-21 03:50:18 +00:00 |
|
|
fatelei
|
023cc26718
|
Merge remote-tracking branch 'upstream/main' into skill
# Conflicts:
# api/controllers/console/tag/tags.py
# api/openapi/markdown/console-openapi.md
# api/services/app_service.py
# packages/contracts/generated/api/console/tags/types.gen.ts
# packages/contracts/generated/api/console/tags/zod.gen.ts
|
2026-08-21 10:19:47 +08:00 |
|
|
GGbond
|
6f70ca8d26
|
refactor(api): decouple console tag management (#40843)
Co-authored-by: Byron Wang <byron@dify.ai>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-08-20 12:31:01 +00:00 |
|
|
FFXN
|
248df5dd25
|
fix(snippet): support snippet history version export (#41012)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-08-20 08:52:45 +00:00 |
|
|
非法操作
|
f97fc01c2f
|
refactor(api): extract recommended app query service (#40207)
|
2026-08-20 08:45:47 +00:00 |
|
|
chelsealong
|
d7b1531431
|
fix(snippets): implement delete for published snippet workflow versions (#41003)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-08-20 07:36:17 +00:00 |
|
|
CodingOnStar
|
4bbca7a0b4
|
Merge remote-tracking branch 'origin/feat/creator-profile-home' into deploy/dev
# Conflicts:
# api/tests/unit_tests/controllers/console/explore/test_banner.py
# packages/contracts/marketplace.ts
# web/app/signup/components/input-mail.tsx
|
2026-08-20 15:24:30 +08:00 |
|
|
CodingOnStar
|
e3b8e26192
|
merge: bring origin/main into feat/creator-profile-home
# Conflicts:
# api/openapi/markdown/console-openapi.md
# api/services/agent_config_service.py
# api/tests/unit_tests/services/agent/test_skill_standardize_service.py
# knip.config.ts
# oxlint-suppressions.json
# packages/contracts/generated/api/console/agent/zod.gen.ts
# packages/contracts/generated/api/console/apps/zod.gen.ts
|
2026-08-20 15:18:59 +08:00 |
|
|
Byron.wang
|
b4e13ec83e
|
refactor(api): add account profile application service (#40436)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-08-20 05:03:08 +00:00 |
|
|
非法操作
|
ee997d00fa
|
refactor(api): reuse web app access queries for permissions (#40984)
|
2026-08-20 02:27:49 +00:00 |
|
|
非法操作
|
532489babd
|
refactor(api): extract web app access queries (#40482)
|
2026-08-19 10:34:36 +00:00 |
|
|
autofix-ci[bot]
|
0ee9b015d5
|
[autofix.ci] apply automated fixes
|
2026-08-19 08:09:14 +00:00 |
|
|
fatelei
|
fe810eef75
|
Merge remote-tracking branch 'upstream/main' into skill
# Conflicts:
# api/openapi/markdown/console-openapi.md
# api/services/agent_config_service.py
# api/tests/unit_tests/services/agent/test_skill_standardize_service.py
# packages/contracts/generated/api/console/agent/zod.gen.ts
# packages/contracts/generated/api/console/apps/zod.gen.ts
|
2026-08-19 15:54:58 +08:00 |
|
|
zyssyz123
|
414f211cde
|
fix(auth): harden email code login verification (#40960)
|
2026-08-19 06:57:47 +00:00 |
|
|
盐粒 Yanli
|
8874f3c80b
|
refactor(agent): remove Agent Drive (#40887)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-08-19 06:34:36 +00:00 |
|
|
CodingOnStar
|
570b01e9e0
|
Merge remote-tracking branch 'origin/feat/creator-profile-home' into deploy/dev
# Conflicts:
# api/tests/unit_tests/core/agent/test_cot_agent_runner.py
# api/tests/unit_tests/core/agent/test_fc_agent_runner.py
# api/tests/unit_tests/core/app/apps/advanced_chat/test_app_runner_input_moderation.py
# api/tests/unit_tests/core/app/apps/test_message_based_app_generator.py
# api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline.py
# api/tests/unit_tests/core/app/task_pipeline/test_message_cycle_manager_optimization.py
# api/tests/unit_tests/services/recommend_app/test_remote_retrieval.py
# web/app/components/header/account-setting/members-page/transfer-ownership-modal/__tests__/member-selector.spec.tsx
# web/app/layout.tsx
|
2026-08-18 21:36:38 +08:00 |
|
|
CodingOnStar
|
3713581520
|
Merge remote-tracking branch 'origin/main' into feat/creator-profile-home
# Conflicts:
# .editorconfig
# oxlint-suppressions.json
# web/app/components/base/markdown-blocks/code-block.tsx
# web/app/layout.tsx
|
2026-08-18 21:30:57 +08:00 |
|
|
autofix-ci[bot]
|
56f716cedc
|
[autofix.ci] apply automated fixes
|
2026-08-18 07:18:36 +00:00 |
|
|
fatelei
|
8a7fd51766
|
merge: resolve upstream main conflicts
|
2026-08-18 15:14:39 +08:00 |
|
|
Byron.wang
|
891627b210
|
refactor(api): decouple data source API key auth flow (#40452)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-08-18 04:30:17 +00:00 |
|
|
CodingOnStar
|
9cd1fe60bb
|
Merge branch 'feat/marketplace-homepage-redesign' into deploy/dev
|
2026-08-17 13:01:32 +08:00 |
|
|
CodingOnStar
|
24b977da27
|
Merge branch 'feat/marketplace-homepage-redesign' into feat/creator-profile-home
|
2026-08-17 13:01:32 +08:00 |
|
|
YungLe
|
219596c4df
|
feat(plugin-auth): visibility picker for OAuth credentials (#39840)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Wu Tianwei <30284043+WTW0313@users.noreply.github.com>
Co-authored-by: twwu <twwu@dify.ai>
|
2026-08-17 02:41:26 +00:00 |
|