Commit Graph
1970 Commits
Author SHA1 Message Date
yyh 6f4352b315 fix(billing): explain annual changes blocked by active discounts 2026-11-12 18:01:51 +08:00
yyh d253b372f2 feat(billing): expose education discount redemption status in Console (#46133)
(cherry picked from commit f56652ca33)
2026-11-12 15:44:04 +08:00
林玮 (Jade Lin) 99a618add9 fix: deliver moderation replies before workflow completion 2026-11-11 16:01:17 +08:00
林玮 (Jade Lin) 20cc352d12 Merge branch 'main' into linw/snp-1063-hosted-moderation 2026-11-11 15:43:47 +08:00
3774ea85ae ci: bump tyck to check new err (#45614)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Codex <codex@openai.com>
2026-11-11 07:31:35 +00:00
非法操作 b39a44c0e1 refactor(agent): isolate API access configuration (#46024) 2026-11-11 06:18:34 +00:00
林玮 (Jade Lin) 0af66e843b Merge branch 'main' into linw/snp-1063-hosted-moderation 2026-11-11 14:07:18 +08:00
Joel 0fb5917e94 Merge branch 'feat/end-user-auth-fe' into deploy/saas
# Conflicts:
#	api/extensions/ext_application_services.py
#	api/tests/unit_tests/migrations/test_end_user_auth_merge.py
2026-11-11 14:05:10 +08:00
Joel 8985962619 Merge remote-tracking branch 'origin/linw/snp-911-end-user-auth' into feat/end-user-auth-fe 2026-11-11 11:57:26 +08:00
Joel 7da7158915 Merge remote-tracking branch 'origin/main' into feat/end-user-auth-fe
# Conflicts:
#	api/controllers/console/app/workflow.py
#	api/controllers/console/flask_admission.py
#	api/tasks/app_generate/workflow_execute_task.py
#	api/tests/unit_tests/tasks/app_generate/test_workflow_execute_task.py
#	packages/contracts/generated/api/console/account/types.gen.ts
#	packages/contracts/generated/api/console/account/zod.gen.ts
#	packages/contracts/generated/api/console/workspaces/orpc.gen.ts
2026-11-11 11:49:50 +08:00
林玮 (Jade Lin) acffcb9403 chore: merge hosted moderation into deploy/saas 2026-11-11 11:14:56 +08:00
林玮 (Jade Lin) c081daa2f2 Merge remote-tracking branch 'origin/main' into linw/snp-911-end-user-auth
# Conflicts:
#	api/tasks/app_generate/workflow_execute_task.py
#	packages/contracts/generated/api/console/workspaces/orpc.gen.ts
2026-11-11 11:11:41 +08:00
583615e412 feat: support personal access token (#45540)
Co-authored-by: twwu <twwu@dify.ai>
Co-authored-by: Eldar Dadashov <52511672+eldardada@users.noreply.github.com>
Co-authored-by: Byron.wang <byron@dify.ai>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Yunlu Wen <yunlu.wen@dify.ai>
2026-11-11 03:00:24 +00:00
FFXNandautofix-ci[bot] f3f9b121a4 feat(knowledge): add GitHub tree previews to source selection (#45990)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-11-11 02:47:23 +00:00
林玮 (Jade Lin) ddd6be214e chore: merge WebApp email changes and runtime updates into deploy/saas 2026-11-11 10:40:25 +08:00
林玮 (Jade Lin) b788b18dab feat(api): add WebApp Account email changes (#45978) 2026-11-11 10:25:42 +08:00
林玮 (Jade Lin) 6eb7b75d2d Merge branch 'main' into linw/snp-1063-hosted-moderation 2026-11-10 17:59:47 +08:00
Joel b69e8ffdc5 Merge remote-tracking branch 'origin/linw/snp-911-end-user-auth' into feat/end-user-auth-fe
# Conflicts:
#	api/repositories/app_definition_query_repository.py
2026-11-10 17:06:08 +08:00
QuantumGhostandzxhlyh a4d64bcddd feat(hitl): improve forms, notifications, and IM contact sync (#45945)
Co-authored-by: zxhlyh <jasonapring2015@outlook.com>
2026-11-10 09:00:41 +00:00
林玮 (Jade Lin) b3296ae35d Merge remote-tracking branch 'origin/main' into linw/snp-911-end-user-auth
# Conflicts:
#	api/controllers/console/app/workflow.py
#	api/tests/unit_tests/tasks/app_generate/test_workflow_execute_task.py
2026-11-10 16:38:15 +08:00
林玮 (Jade Lin) db05dd57dd chore: merge WebApp Account settings into deploy/saas 2026-11-10 16:32:12 +08:00
林玮 (Jade Lin) 8854babdf1 feat(api): add WebApp Account settings endpoints (#45972) 2026-11-10 16:21:02 +08:00
非法操作andautofix-ci[bot] ce26b22970 refactor(api): isolate trigger execution lifecycle (#45950)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-11-10 08:17:39 +00:00
非法操作 27297e954f refactor(api): inject trigger debug runtime (#45946) 2026-11-10 07:09:35 +00:00
非法操作andStream 9fbd9dcd33 refactor(api): isolate native webhook runtime (#45912)
Co-authored-by: Stream <Stream_2@qq.com>
2026-11-10 05:08:50 +00:00
Joel 181f909969 Merge branch 'feat/end-user-auth-fe' into deploy/saas
# Conflicts:
#	api/repositories/app_definition_query_repository.py
#	api/services/app_definition_query_service.py
#	api/services/entities/tool_connection_entities.py
#	api/tests/unit_tests/services/test_workflow_tool_end_user_restriction.py
2026-11-10 10:51:29 +08:00
林玮 (Jade Lin) ba144bb1a2 Merge remote-tracking branch 'origin/main' into linw/snp-911-end-user-auth
# Conflicts:
#	api/repositories/app_definition_query_repository.py
2026-11-10 10:39:45 +08:00
Joel de6ba97fa0 Merge remote-tracking branch 'origin/linw/snp-911-end-user-auth' into feat/end-user-auth-fe
# Conflicts:
#	api/services/app_definition_query_service.py
#	api/tests/unit_tests/services/test_workflow_tool_end_user_restriction.py
2026-11-10 10:38:38 +08:00
Joel 031cb178d2 Merge remote-tracking branch 'origin/main' into feat/end-user-auth-fe
# Conflicts:
#	api/repositories/app_definition_query_repository.py
2026-11-10 10:19:20 +08:00
林玮 (Jade Lin) b155868cd6 chore: merge Installed App list filters and sorting into deploy/saas 2026-11-10 10:06:28 +08:00
林玮 (Jade Lin) 19b8f55001 fix(api): preserve app moderation failures and plugin scope 2026-11-10 10:00:13 +08:00
林玮 (Jade Lin) 4d0aacfac0 feat(api): support installed app list sorting (#45926) 2026-11-10 09:57:52 +08:00
Tanishq 99683fe2e8 fix(trigger): store webhook uploads under the trigger end user (#44995) 2026-11-09 18:39:05 +00:00
XiaoBa 23ea5e3562 fix: validate retrieval attachment UUIDs and tolerate invalid image history (#45915) 2026-11-09 11:36:53 +00:00
林玮 (Jade Lin) 226bf603d9 feat(api): add installed app list type filtering (#45919) 2026-11-09 18:20:31 +08:00
非法操作 e37e727184 refactor(api): inject trigger workflow dispatch and execution logging (#45195) 2026-11-09 08:44:55 +00:00
林玮 (Jade Lin) aac656a819 chore: merge Service API EndUser auth restriction into deploy/saas 2026-11-09 16:26:08 +08:00
林玮 (Jade Lin) 194988f3a2 fix(api): block Service API access to EndUser-auth apps (#45903) 2026-11-09 16:08:00 +08:00
Joel b60ef3daa8 Merge branch 'feat/end-user-auth-fe' into deploy/saas
# Conflicts:
#	api/openapi/markdown/web-openapi.md
#	packages/contracts/generated/api/web/orpc.gen.ts
2026-11-09 15:42:26 +08:00
Joel ca0b5da58e Merge remote-tracking branch 'origin/main' into feat/end-user-auth-fe
# Conflicts:
#	packages/dev-proxy/README.md
#	packages/dev-proxy/src/server.spec.ts
#	packages/dev-proxy/src/server.ts
#	packages/dev-proxy/src/session-import.spec.ts
#	packages/dev-proxy/src/types.ts
#	web/.env.example
#	web/dev-proxy.config.ts
2026-11-09 15:38:38 +08:00
林玮 (Jade Lin) 0970b352d2 chore: merge workflow admission and trigger updates into deploy/saas 2026-11-09 14:35:27 +08:00
非法操作 b6d2d2170d refactor(api): inject app trigger publication and quota status lifecycle (#45188) 2026-11-09 06:29:12 +00:00
林玮 (Jade Lin) c2b0a2a565 fix(api): map moderation errors to stable responses 2026-11-09 14:21:17 +08:00
Joel 867f08b183 Merge remote-tracking branch 'origin/linw/snp-911-end-user-auth' into feat/end-user-auth-fe
# Conflicts:
#	api/openapi/markdown/web-openapi.md
#	api/tests/unit_tests/controllers/web/test_migration.py
#	packages/contracts/generated/api/web/orpc.gen.ts
2026-11-09 12:50:55 +08:00
Joel 111eada536 Merge branch 'feat/end-user-auth-fe' into deploy/saas
# Conflicts:
#	api/tests/unit_tests/services/test_workflow_tool_end_user_restriction.py
#	web/app/components/share/connections/connection-readme.tsx
2026-11-09 12:44:53 +08:00
林玮 (Jade Lin) 559e17ec15 chore: merge Chatbot history migration into deploy/saas 2026-11-09 12:36:38 +08:00
林玮 (Jade Lin) 89f4c0a9fa Merge remote-tracking branch 'origin/main' into linw/snp-911-end-user-auth
# Conflicts:
#	api/controllers/console/app/workflow.py
#	api/tests/unit_tests/tasks/test_remove_app_and_related_data_task.py
2026-11-09 12:36:20 +08:00
林玮 (Jade Lin) 19c847e214 feat(api): support Chatbot guest history migration (#45720) 2026-11-09 12:22:24 +08:00
林玮 (Jade Lin) 469d24c7bc chore: merge console connection ID fix into deploy/saas 2026-11-09 11:23:18 +08:00
林玮 (Jade Lin) a4bcf028eb fix(api): return console connection IDs after creation (#45869) 2026-11-09 11:18:29 +08:00