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
yyh
643e2d66bf
chore(deps): upgrade pnpm workspace dependencies ( #41138 )
2026-08-24 07:07:47 +00: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
yyh
c62947f1f1
refactor(dify-ui): rename radio family entrypoint ( #41104 )
2026-08-23 08:08:29 +00:00
yyh
e18310e52e
refactor(dify-ui): simplify overlay content APIs ( #41098 )
2026-08-22 23:54:08 +00:00
fatelei
4bfd7b13e7
Merge branch 'user_access_policy_pagnination' into deploy/dev
...
# Conflicts:
# oxlint-suppressions.json
2026-08-22 19:03:24 +08:00
yyh
a9b8c84e9b
refactor(dify-ui): simplify popover content API ( #41069 )
2026-08-21 13:11:40 +00:00
yyh
6cb96adfbe
refactor(dify-ui): compose dialog close controls ( #41064 )
2026-08-21 10:21:43 +00:00
yyh
faca558bf5
fix(web): prevent Safari clipping tour recovery prompt ( #41060 )
2026-08-21 09:19:38 +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
yyh
363af810f2
refactor(dify-ui): expose slider anatomy ( #41045 )
2026-08-21 13:15:39 +08:00
yyh
103c08e827
docs(dify-ui): establish documentation hierarchy ( #41044 )
2026-08-21 13:15:38 +08:00
autofix-ci[bot]
f0fbc6bb5b
[autofix.ci] apply automated fixes
2026-08-21 03:50:18 +00:00
yyh
720e1fab9b
refactor(dify-ui): expose slider anatomy ( #41045 )
2026-08-21 03:15:45 +00:00
yyh
ca6f4e11f9
docs(dify-ui): establish documentation hierarchy ( #41044 )
2026-08-21 02:29:41 +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
yyh
72b6a4e6ed
refactor: consolidate frontend browser test infrastructure ( #40997 )
2026-08-20 06:13:30 +00: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
yyh
98c2ffeec7
fix(ui): align toast swipe direction with viewport ( #40980 )
2026-08-19 13:16:12 +00:00
非法操作
532489babd
refactor(api): extract web app access queries ( #40482 )
2026-08-19 10:34:36 +00:00
CodingOnStar
4ef15cae6a
fix(web): sort creator profile creations through publisher APIs
...
Pass sort_by and sort_order to the publisher plugin and template lists, and keep the mixed Creations grid ordered after both responses return.
2026-08-19 18:23:35 +08:00
yyh
6fa9c14490
fix(ui): stabilize toast stack interactions ( #40970 )
2026-08-19 10:13:43 +00:00
CodingOnStar
803c3cd2df
fix(web): restore creator profile contracts and i18n
...
The standalone and embedded creator pages call marketplaceClient.creatorDetail,
but those routes were dropped from the marketplace contract. Restore them, skip
avatar fetches when none was uploaded, and add creatorProfile strings to every
plugin locale.
2026-08-19 16:37:14 +08: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
yyh
05499b9011
test(dify-ui): stabilize dropdown menu story ( #40916 )
2026-08-18 04:05:24 +00:00
CodingOnStar
f3fa7e6ed6
merge: bring marketplace autocomplete split into deploy/dev
2026-08-18 11:00:55 +08:00
CodingOnStar
4d8bd40058
merge: bring origin/main into feat/creator-profile-home
...
Keep marketplace workspace-skill runtime tests and take main's
autocomplete popup anatomy plus input-group composition.
2026-08-18 10:39:42 +08:00
yyh
6d89557355
feat(dify-ui): add input group composition ( #40890 )
2026-08-18 02:14:39 +00:00
yyh
76a91eb433
refactor(dify-ui): expose autocomplete popup anatomy ( #40895 )
2026-08-18 02:06:03 +00:00