Commit Graph
420 Commits
Author SHA1 Message Date
林玮 (Jade Lin) 99a618add9 fix: deliver moderation replies before workflow completion 2026-11-11 16:01:17 +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
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) b788b18dab feat(api): add WebApp Account email changes (#45978) 2026-11-11 10:25:42 +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) 8854babdf1 feat(api): add WebApp Account settings endpoints (#45972) 2026-11-10 16:21:02 +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) 4d0aacfac0 feat(api): support installed app list sorting (#45926) 2026-11-10 09:57:52 +08: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
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
林玮 (Jade Lin) 19c847e214 feat(api): support Chatbot guest history migration (#45720) 2026-11-09 12:22:24 +08:00
林玮 (Jade Lin) a4bcf028eb fix(api): return console connection IDs after creation (#45869) 2026-11-09 11:18:29 +08:00
Joel b854116334 Merge remote-tracking branch 'origin/linw/snp-911-end-user-auth' into feat/end-user-auth-fe 2026-11-09 11:14:28 +08:00
林玮 (Jade Lin) 75dd516277 fix(api): expose WebApp URL before authentication (#45721) 2026-11-09 10:25:28 +08:00
Joel 15088c2d10 Merge remote-tracking branch 'origin/linw/snp-911-end-user-auth' into feat/end-user-auth-fe
# Conflicts:
#	api/openapi/markdown/web-openapi.md
2026-11-06 11:35:23 +08:00
林玮 (Jade Lin) 3cf6bf46fd Merge remote-tracking branch 'origin/main' into linw/snp-911-end-user-auth
# Conflicts:
#	api/extensions/ext_application_services.py
#	api/openapi/markdown/web-openapi.md
#	packages/contracts/generated/api/console/errors.gen.ts
#	packages/contracts/generated/api/console/workspaces/errors.gen.ts
#	packages/contracts/generated/api/web/types.gen.ts
2026-11-06 11:11:21 +08:00
林玮 (Jade Lin) be6da1c21a fix(api): expose WebApp login URL before authentication (#45688) 2026-11-06 10:49:52 +08:00
林玮 (Jade Lin) 054dea15bc feat(api): cover all published consumer WebApps (#45670) 2026-11-06 10:08:46 +08:00
yyh 09960da9e5 Merge remote-tracking branch 'origin/main' into feat/end-user-auth-fe 2026-11-05 21:26:31 +08:00
林玮 (Jade Lin) fa615eddcd feat(api): expose account login URL in WebApp profile (#45660) 2026-11-05 18:10:08 +08:00
非法操作 803f5d3d9c refactor(api): isolate trigger subscription management (#44541) 2026-11-05 09:54:35 +00:00
Joel f3641c6295 Merge branch 'linw/snp-911-end-user-auth' of https://github.com/langgenius/dify into feat/end-user-auth-fe
# Conflicts:
#	api/.importlinter
#	api/core/tools/tool_manager.py
#	api/extensions/ext_application_services.py
#	api/models/workflow.py
#	api/repositories/conversation_repository.py
#	api/repositories/message_repository.py
#	api/services/app_definition_query_service.py
#	api/tasks/app_generate/workflow_execute_task.py
#	api/tests/unit_tests/controllers/web/test_app.py
#	api/tests/unit_tests/controllers/web/test_migration.py
#	api/tests/unit_tests/repositories/app/test_console_repository.py
#	api/tests/unit_tests/services/test_app_definition_query_service.py
#	web/app/components/base/chat/chat-with-history/chat-wrapper.tsx
#	web/app/components/base/chat/chat-with-history/context.ts
#	web/app/components/base/chat/chat-with-history/index.tsx
#	web/app/components/base/chat/chat-with-history/sidebar/index.tsx
#	web/app/components/base/chat/embedded-chatbot/context.ts
#	web/app/components/base/chat/embedded-chatbot/index.tsx
#	web/app/components/share/text-generation/index.tsx
#	web/app/components/share/text-generation/result/hooks/use-result-sender.ts
#	web/app/components/share/text-generation/run-batch/index.tsx
#	web/app/components/share/text-generation/text-generation-sidebar.tsx
2026-11-05 16:44:35 +08:00
非法操作 45279b704d feat: restrict SaaS workflow collaboration to paid plans (#45549) 2026-11-05 08:19:37 +00:00
林玮 (Jade Lin) 209e621c23 feat(api): support end-user personal portal login (#45637) 2026-11-05 16:14:02 +08:00
非法操作 11517691d2 refactor(api): isolate trigger OAuth authorization flow (#44505) 2026-11-05 06:21:44 +00:00
林玮 (Jade Lin) febb5f949f Merge remote-tracking branch 'origin/main' into linw/snp-911-end-user-auth
# Conflicts:
#	api/.importlinter
#	api/controllers/console/__init__.py
#	api/controllers/console/workspace/account.py
#	api/core/app/apps/message_based_app_generator.py
#	api/core/app/entities/app_invoke_entities.py
#	api/core/tools/tool_manager.py
#	api/extensions/application_services/installed_app.py
#	api/extensions/ext_application_services.py
#	api/models/__init__.py
#	api/models/workflow.py
#	api/openapi/markdown/console-openapi.md
#	api/openapi/markdown/web-openapi.md
#	api/repositories/account/repository.py
#	api/repositories/api_workflow_run_repository.py
#	api/repositories/app/console_repository.py
#	api/repositories/app_definition_query_repository.py
#	api/services/app_definition_query_service.py
#	api/services/app_generate_service.py
#	api/services/conversation_service.py
#	api/services/message_service.py
#	api/services/web_conversation_service.py
#	api/tasks/app_generate/workflow_execute_task.py
#	api/tests/unit_tests/controllers/console/auth/test_login.py
#	api/tests/unit_tests/controllers/web/test_app.py
#	api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py
#	api/tests/unit_tests/repositories/app/test_console_repository.py
#	api/tests/unit_tests/services/test_app_definition_query_service.py
#	api/tests/unit_tests/services/test_app_generate_service.py
#	api/tests/unit_tests/services/test_message_service.py
#	docker/envs/core-services/api.env.example
#	packages/contracts/generated/api/console/account/types.gen.ts
#	packages/contracts/generated/api/console/account/zod.gen.ts
#	packages/contracts/generated/api/console/apps/errors.gen.ts
#	packages/contracts/generated/api/console/apps/orpc.gen.ts
#	packages/contracts/generated/api/console/errors.gen.ts
#	packages/contracts/generated/api/console/workspaces/errors.gen.ts
#	packages/contracts/generated/api/console/workspaces/orpc.gen.ts
#	packages/contracts/generated/api/web/errors.gen.ts
#	packages/contracts/generated/api/web/orpc.gen.ts
#	packages/contracts/generated/api/web/types.gen.ts
#	packages/contracts/generated/api/web/zod.gen.ts
2026-11-05 14:17:44 +08:00
林玮 (Jade Lin) cd36709825 feat(api): support Installed App workspace connections (#45593) 2026-11-05 13:53:16 +08:00
Joel c7513bee8c Merge remote-tracking branch 'origin/main' into feat/end-user-auth-fe
# Conflicts:
#	packages/contracts/generated/api/console/workspaces/errors.gen.ts
2026-11-05 10:43:43 +08:00
非法操作 b501b64f82 refactor(api): isolate trigger OAuth client configuration (#44469) 2026-11-04 12:02:15 +00:00
Joel 89dd2e0245 Merge branch 'linw/snp-911-end-user-auth' of https://github.com/langgenius/dify into feat/end-user-auth-fe
# Conflicts:
#	api/controllers/console/workspace/account.py
#	api/controllers/web/migration.py
#	api/core/app/apps/message_based_app_generator.py
#	api/openapi/markdown/web-openapi.md
#	api/repositories/account/repository.py
#	api/services/conversation_service.py
#	api/services/message_service.py
#	api/services/web_conversation_service.py
#	api/tests/unit_tests/controllers/web/test_migration.py
#	api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py
#	api/tests/unit_tests/repositories/app/test_console_repository.py
#	api/tests/unit_tests/services/test_message_service.py
#	packages/contracts/generated/api/console/account/types.gen.ts
#	packages/contracts/generated/api/console/account/zod.gen.ts
#	packages/contracts/generated/api/console/errors.gen.ts
#	packages/contracts/generated/api/console/workspaces/errors.gen.ts
#	packages/contracts/generated/api/console/workspaces/orpc.gen.ts
#	packages/contracts/generated/api/web/errors.gen.ts
#	packages/contracts/generated/api/web/orpc.gen.ts
#	packages/contracts/generated/api/web/types.gen.ts
#	packages/contracts/generated/api/web/zod.gen.ts
2026-11-04 17:23:28 +08:00
林玮 (Jade Lin) d4a73ba3df feat(api): migrate Guest resources after Account login (#44984) 2026-11-04 16:24:16 +08:00
林玮 (Jade Lin) e21bba69e8 feat(api): add explicit Cloud workspace activation (#45452) 2026-11-04 14:02:04 +08:00
林玮 (Jade Lin) 159288b269 feat(api): report unconfigured WebApp connections (#45520) 2026-11-04 14:01:10 +08:00
林玮 (Jade Lin) 318c8d18e4 feat(api): group consumer connections by provider (#45519) 2026-11-04 13:45:59 +08:00
林玮 (Jade Lin) d321d06466 feat(api): persist WebApp usage and preferences (#45511) 2026-11-04 12:28:13 +08:00
Joel 045a10ed5c Merge remote-tracking branch 'origin/main' into feat/end-user-auth-fe
# Conflicts:
#	api/openapi/markdown/web-openapi.md
#	oxlint-suppressions.json
#	packages/contracts/generated/api/web/zod.gen.ts
#	web/i18n/locales/ar-TN/login.json
#	web/i18n/locales/az-AZ/login.json
#	web/i18n/locales/de-DE/login.json
#	web/i18n/locales/en-US/login.json
#	web/i18n/locales/es-ES/login.json
#	web/i18n/locales/fa-IR/login.json
#	web/i18n/locales/fr-FR/login.json
#	web/i18n/locales/hi-IN/login.json
#	web/i18n/locales/id-ID/login.json
#	web/i18n/locales/it-IT/login.json
#	web/i18n/locales/ja-JP/login.json
#	web/i18n/locales/ko-KR/login.json
#	web/i18n/locales/lo-LA/login.json
#	web/i18n/locales/nl-NL/login.json
#	web/i18n/locales/pl-PL/login.json
#	web/i18n/locales/pt-BR/login.json
#	web/i18n/locales/ro-RO/login.json
#	web/i18n/locales/ru-RU/login.json
#	web/i18n/locales/sl-SI/login.json
#	web/i18n/locales/th-TH/login.json
#	web/i18n/locales/tr-TR/login.json
#	web/i18n/locales/uk-UA/login.json
#	web/i18n/locales/vi-VN/login.json
#	web/i18n/locales/zh-Hans/login.json
#	web/i18n/locales/zh-Hant/login.json
#	web/i18n/resources.generated.d.ts
2026-11-04 10:29:38 +08:00
Joel a300c4d54d Merge branch 'linw/snp-911-end-user-auth' of https://github.com/langgenius/dify into feat/end-user-auth-fe
# Conflicts:
#	api/extensions/ext_application_services.py
#	api/openapi/markdown/web-openapi.md
#	api/repositories/app/console_repository.py
#	packages/contracts/generated/api/web/errors.gen.ts
#	packages/contracts/generated/api/web/orpc.gen.ts
#	packages/contracts/generated/api/web/types.gen.ts
2026-11-03 18:23:38 +08:00
非法操作andautofix-ci[bot] 52ae152e00 fix(api): reject invalid model provider icon paths (#45445)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-11-03 10:01:37 +00:00
28dabd92ac feat(agent): add opt-in show thinking toggle for Agent v2 chat (#45427)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
2026-11-03 09:49:33 +00:00