Elian Doran
1b7d2da6cb
Merge remote-tracking branch 'origin/main' into standalone
...
; 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
2026-03-22 12:56:14 +02:00
Elian Doran
8357c2a39c
chore(pdfjs): version not updated for releases
2026-03-03 14:19:24 +02:00
Elian Doran
da7a61a8b6
Merge remote-tracking branch 'origin/main' into HEAD
...
; Conflicts:
; apps/client/src/index.ts
; apps/client/src/widgets/sql_table_schemas.tsx
; apps/server/package.json
; apps/server/src/app.ts
; apps/server/src/becca/entities/bnote.ts
; apps/server/src/services/import/single.ts
; apps/server/src/services/import/zip.ts
; apps/server/src/services/note-interface.ts
; apps/server/src/services/notes.ts
; apps/server/src/services/tree.ts
; apps/server/src/services/utils.ts
; apps/server/src/share/shaca/entities/snote.ts
; pnpm-lock.yaml
; scripts/update-nightly-version.ts
; scripts/update-version.ts
2026-01-29 21:47:06 +02:00
Wael Nasreddine
fb4d63b049
Add --config, --help, and --version flags to edit-docs
...
- Implement --config (-c) flag to allow custom configuration file paths.
- Add --help (-h) flag to display tool usage and available options.
- Add --version (-v) flag to display the current Trilium version.
- Update electron-start.mts to correctly pass command-line arguments to Electron.
- Synchronize edit-docs version with the root package.json via update-version.ts.
- Resolve config paths relative to the configuration file's directory.
This makes edit-docs more robust and easier to use from external projects
and immutable environments like Nix.
2026-01-12 22:08:27 -08:00
Elian Doran
659573b864
fix(client-standalone): update version to match
2026-01-12 20:50:12 +02:00
Elian Doran
ef6eac6f6e
chore(desktop): fix version
2025-05-27 22:26:52 +03:00
Elian Doran
8e4b3711d4
refactor(scripts): fix type errors
2025-05-27 22:25:00 +03:00
Elian Doran
6b64c4daaa
chore(release): update version in package.json
2025-05-02 21:29:19 +03:00
