Commit Graph

12 Commits

Author SHA1 Message Date
Stephen Zhou
3e59fba46a
Merge remote-tracking branch 'origin/main' into deploy/konwledge
# Conflicts:
#	api/controllers/console/app/app.py
#	api/controllers/console/app/app_import.py
#	api/controllers/console/auth/activate.py
#	api/controllers/console/setup.py
#	api/tests/unit_tests/controllers/console/workspace/test_plugin.py
#	web/features/new-rag/document-list.tsx
#	web/features/new-rag/sources-page.tsx
#	web/features/new-rag/website-crawl-preview.tsx
2026-08-10 10:34:47 +08:00
Xiyuan Chen
ab0e131e87
refactor(api): move license expiry notice flag onto license detail (#40128)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-08-07 03:53:35 +00:00
Xiyuan Chen
4b2c5ac4ae
feat: make the console license expiry badge optional (#39972)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-08-07 02:28:58 +00:00
Stephen Zhou
fde800e337
Merge remote-tracking branch 'origin/main' into deploy/konwledge
# Conflicts:
#	.github/dependabot.yml
#	.github/workflows/deploy-dev.yml
#	api/app_factory.py
#	api/core/indexing_runner.py
#	api/services/feature_service.py
#	api/tests/test_containers_integration_tests/controllers/console/auth/test_password_reset.py
#	api/tests/test_containers_integration_tests/services/test_feature_service.py
#	api/tests/unit_tests/controllers/console/auth/test_account_activation.py
#	api/tests/unit_tests/controllers/service_api/app/test_conversation.py
#	api/tests/unit_tests/controllers/web/test_site.py
#	api/tests/unit_tests/core/rag/indexing/test_indexing_runner.py
#	api/tests/unit_tests/core/tools/test_base_tool.py
#	api/tests/unit_tests/extensions/otel/test_retrieval_tracing.py
#	api/tests/unit_tests/extensions/test_ext_login.py
#	api/tests/unit_tests/services/test_feature_service_deployment_edition.py
#	api/tests/unit_tests/services/test_feature_service_knowledge_fs.py
#	api/tests/unit_tests/services/test_feature_service_licensed_seats.py
2026-08-07 09:55:10 +08:00
yyh
5e036e5489
refactor(system-features): derive nullable SSO protocol (#40063) 2026-08-06 04:51:32 +00:00
Stephen Zhou
24847366e1
Merge remote-tracking branch 'origin/main' into deploy/konwledge
# Conflicts:
#	api/app_factory.py
#	api/controllers/console/workspace/workspace.py
#	api/services/agent/observability_service.py
#	api/tests/unit_tests/core/rag/docstore/test_dataset_docstore.py
#	api/tests/unit_tests/core/rag/embedding/test_token_counter.py
#	api/tests/unit_tests/core/rag/indexing/test_indexing_runner.py
#	api/tests/unit_tests/services/agent/test_agent_observability_service.py
2026-08-06 10:46:15 +08:00
yyh
dc09384b1d
refactor(web): derive system feature enums from schemas (#40030) 2026-08-05 08:32:54 +00:00
Stephen Zhou
28c2b6ee95
Merge remote-tracking branch 'origin/main' into deploy/konwledge
# Conflicts:
#	api/controllers/console/auth/login.py
#	api/controllers/console/feature.py
#	api/controllers/web/site.py
#	api/openapi/markdown/console-openapi.md
#	api/openapi/markdown/web-openapi.md
#	api/services/feature_service.py
#	api/tests/test_containers_integration_tests/services/test_account_service.py
#	api/tests/test_containers_integration_tests/services/test_feature_service.py
#	api/tests/unit_tests/controllers/console/auth/test_email_verification.py
#	api/tests/unit_tests/controllers/console/auth/test_login_logout.py
#	api/tests/unit_tests/controllers/web/test_site.py
#	api/tests/unit_tests/services/test_recommended_app_service.py
2026-07-27 13:16:01 +08:00
Stephen Zhou
1cde846bcf
fix(dataset): integrate New RAG with KnowledgeFS (#39621) 2026-07-27 12:52:44 +08:00
yyh
c61d33f91e
refactor: move trial app capability out of system features (#39562) 2026-07-26 12:02:30 +00:00
yyh
aff5c47541
refactor: remove backend-only system feature fields (#39543) 2026-07-25 02:01:12 +00:00
yyh
66a545fc6d
refactor: centralize deployment edition in system features (#39454)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: GareArc <garethcxy@dify.ai>
2026-07-24 07:15:02 +00:00