Commit Graph
16 Commits
Author SHA1 Message Date
林玮 (Jade Lin) 559e17ec15 chore: merge Chatbot history migration into deploy/saas 2026-11-09 12:36:38 +08:00
林玮 (Jade Lin) 19c847e214 feat(api): support Chatbot guest history migration (#45720) 2026-11-09 12:22:24 +08:00
林玮 (Jade Lin) 4cc9814b1e chore: merge WebApp discovery and connection updates into deploy/saas 2026-11-09 10:59:52 +08:00
林玮 (Jade Lin) 65d5ba18ec refactor(api): trim end-user connection abstractions 2026-11-06 15:38:27 +08: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
Joel 53419ee78c Merge branch 'feat/end-user-auth-fe' into deploy/saas
# Conflicts:
#	api/controllers/web/migration.py
#	api/openapi/markdown/web-openapi.md
#	api/repositories/conversation_repository.py
#	api/repositories/conversation_variable_repository.py
#	api/repositories/message_repository.py
#	api/services/conversation_service.py
#	api/tests/unit_tests/controllers/web/test_migration.py
#	api/tests/unit_tests/services/test_web_workflow_admission.py
#	packages/contracts/generated/api/web/orpc.gen.ts
2026-11-05 10:32:25 +08: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) 40f0c5d79b chore: merge guest migration updates into deploy/saas 2026-11-04 17:00:43 +08:00
林玮 (Jade Lin) d4a73ba3df feat(api): migrate Guest resources after Account login (#44984) 2026-11-04 16:24:16 +08:00
Joel ae394e8d97 chore: merge latest end-user connection selection contracts 2026-10-29 15:44:10 +08:00
林玮 (Jade Lin) 97bb99fa1b chore: merge end-user auth updates into deploy/saas 2026-10-29 15:37:12 +08:00
林玮 (Jade Lin) b8df0cd303 feat(api): save connection choices on authorization (#45039) 2026-10-29 15:33:31 +08:00
Joel 039900cda9 chore: sync remote deploy/saas migration tests 2026-10-28 18:41:03 +08:00
林玮 (Jade Lin) cc9365648b test(api): use WebApp cookies in guest migration handoff 2026-10-28 18:39:16 +08:00
Joel ddd5fce3e9 chore: merge latest end-user auth backend updates 2026-10-28 18:36:32 +08:00
林玮 (Jade Lin) c9be18e0a3 feat(api): add Guest migration endpoints (#44877) 2026-10-28 15:56:22 +08:00