mirror of
https://github.com/zadam/trilium.git
synced 2026-03-23 04:10:16 +01:00
1b7d2da6cb
; Conflicts: ; apps/client/src/layouts/mobile_layout.tsx ; apps/client/src/services/promoted_attribute_definition_parser.ts ; apps/server/package.json ; apps/server/src/becca/entities/bnote.ts ; apps/server/src/etapi/etapi_utils.ts ; apps/server/src/etapi/notes.ts ; apps/server/src/routes/api/clipper.ts ; apps/server/src/routes/api/export.ts ; apps/server/src/routes/api/files.ts ; apps/server/src/routes/api/image.ts ; apps/server/src/routes/api/import.ts ; apps/server/src/routes/api/note_map.ts ; apps/server/src/routes/api/search.ts ; apps/server/src/routes/api/similar_notes.ts ; apps/server/src/routes/api/sync.ts ; apps/server/src/routes/error_handlers.ts ; apps/server/src/routes/index.ts ; apps/server/src/routes/route_api.ts ; apps/server/src/routes/routes.ts ; apps/server/src/services/anonymization.ts ; apps/server/src/services/app_info.ts ; apps/server/src/services/builtin_attributes.ts ; apps/server/src/services/export/zip.ts ; apps/server/src/services/hidden_subtree.ts ; apps/server/src/services/llm/ai_service_manager.ts ; apps/server/src/services/llm/context/modules/context_formatter.ts ; apps/server/src/services/llm/context/note_content.ts ; apps/server/src/services/llm/formatters/base_formatter.ts ; apps/server/src/services/llm/formatters/ollama_formatter.ts ; apps/server/src/services/llm/formatters/openai_formatter.ts ; apps/server/src/services/llm/tools/read_note_tool.ts ; apps/server/src/services/note_types.ts ; apps/server/src/services/notes.ts ; apps/server/src/services/options.ts ; apps/server/src/services/options_init.ts ; apps/server/src/services/search/expressions/note_content_fulltext.ts ; apps/server/src/services/utils.ts ; apps/server/src/services/ws.ts ; apps/server/src/share/content_renderer.ts ; packages/commons/src/lib/builtin_attributes.ts ; packages/commons/src/lib/rows.ts ; packages/trilium-core/src/routes/api/attachments.ts ; packages/trilium-core/src/routes/api/attributes.ts ; packages/trilium-core/src/routes/api/branches.ts ; packages/trilium-core/src/routes/api/notes.ts ; packages/trilium-core/src/routes/api/recent_changes.ts ; packages/trilium-core/src/routes/api/revisions.ts ; packages/trilium-core/src/routes/api/sql.ts ; packages/trilium-core/src/routes/api/stats.ts ; packages/trilium-core/src/services/attributes.ts ; packages/trilium-core/src/services/builtin_attributes.ts ; packages/trilium-core/src/services/promoted_attribute_definition_parser.ts ; pnpm-lock.yaml