mirror of
https://github.com/zadam/trilium.git
synced 2025-11-02 03:16:11 +01:00
Merge branch 'main' into feat/quick-search-multiline-results
This commit is contained in:
perf3ct
@@ -1,6 +1,6 @@
|
||||
<p>Trilium supports configuration via a file named <code>config.ini</code> and
|
||||
environment variables. Please review the file named <a href="https://github.com/TriliumNext/Trilium/blob/develop/apps/server/src/assets/config-sample.ini">config-sample.ini</a> in
|
||||
the <a href="https://github.com/TriliumNext/Trilium">Notes</a> repository
|
||||
environment variables. Please review the file named <a href="https://github.com/TriliumNext/Trilium/blob/main/apps/server/src/assets/config-sample.ini">config-sample.ini</a> in
|
||||
the <a href="https://github.com/TriliumNext/Trilium">Trilium</a> repository
|
||||
to see what values are supported.</p>
|
||||
<p>You can provide the same values via environment variables instead of the <code>config.ini</code> file,
|
||||
and these environment variables use the following format:</p>
|
||||
|
||||
@@ -231,23 +231,17 @@
|
||||
first, then adds fuzzy matching when needed.</p>
|
||||
<h3>How Progressive Search Works</h3>
|
||||
<ol>
|
||||
<li>
|
||||
<p><strong>Phase 1 - Exact Matching</strong>: When you search, Trilium first
|
||||
looks for exact matches of your search terms. This handles the vast majority
|
||||
of searches (90%+) and returns results almost instantly.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p><strong>Phase 2 - Fuzzy Fallback</strong>: If Phase 1 doesn't find enough
|
||||
high-quality results (fewer than 5 results with good relevance scores),
|
||||
Trilium automatically adds fuzzy matching to find results with typos or
|
||||
spelling variations.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p><strong>Result Ordering</strong>: Exact matches always appear before fuzzy
|
||||
matches, regardless of individual scores. This ensures that when you search
|
||||
for "project", notes containing the exact word "project" will appear before
|
||||
notes containing similar words like "projects" or "projection".</p>
|
||||
</li>
|
||||
<li><strong>Phase 1 - Exact Matching</strong>: When you search, Trilium first
|
||||
looks for exact matches of your search terms. This handles the vast majority
|
||||
of searches (90%+) and returns results almost instantly.</li>
|
||||
<li><strong>Phase 2 - Fuzzy Fallback</strong>: If Phase 1 doesn't find enough
|
||||
high-quality results (fewer than 5 results with good relevance scores),
|
||||
Trilium automatically adds fuzzy matching to find results with typos or
|
||||
spelling variations.</li>
|
||||
<li><strong>Result Ordering</strong>: Exact matches always appear before fuzzy
|
||||
matches, regardless of individual scores. This ensures that when you search
|
||||
for "project", notes containing the exact word "project" will appear before
|
||||
notes containing similar words like "projects" or "projection".</li>
|
||||
</ol>
|
||||
<h3>Progressive Search Behavior</h3>
|
||||
<ul>
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
<p>There are two types of error logs, both of which are useful when reporting
|
||||
bugs.</p>
|
||||
<ul>
|
||||
<li data-list-item-id="e5d891396e04bcb9d78ea10421e8ee6be"><a class="reference-link" href="#root/pOsGYCXsbNQG/BgmBlOIl72jZ/qzNzp9LYQyPT/_help_bnyigUA2UK7s">Backend (server) logs</a>
|
||||
<li><a class="reference-link" href="#root/_help_bnyigUA2UK7s">Backend (server) logs</a>
|
||||
</li>
|
||||
<li data-list-item-id="e94ecb76c9af944e47bf8b5c5dabf027a"><a class="reference-link" href="#root/pOsGYCXsbNQG/BgmBlOIl72jZ/qzNzp9LYQyPT/_help_9yEHzMyFirZR">Frontend logs</a>
|
||||
<li><a class="reference-link" href="#root/_help_9yEHzMyFirZR">Frontend logs</a>
|
||||
</li>
|
||||
</ul>
|
||||
<h2>Providing sensitive data</h2>
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<h2>Accessing via the backend log</h2>
|
||||
<p>In the <a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_x3i7MxGccDuM">Global menu</a>,
|
||||
<p>In the <a class="reference-link" href="#root/_help_x3i7MxGccDuM">Global menu</a>,
|
||||
go to Advanced → Show backend log</p>
|
||||
<h2>Location on the disk</h2>
|
||||
<p>Backend logs are stored on the file system. To find them, open the
|
||||
<a
|
||||
class="reference-link" href="#root/pOsGYCXsbNQG/Otzi9La2YAUX/_help_tAassRL4RSQL">Data directory</a>, go to the <code>log</code> subdirectory and find the
|
||||
class="reference-link" href="#root/_help_tAassRL4RSQL">Data directory</a>, go to the <code>log</code> subdirectory and find the
|
||||
latest log file, e.g. <code>trilium-2022-12-14.log</code>. </p>
|
||||
<h2>Reporting backend bugs</h2>
|
||||
<p>You can attach the whole file to the bug report (preferable) or open it
|
||||
@@ -15,12 +15,18 @@
|
||||
in order to reduce the space consumption.</p>
|
||||
<p>It's possible to change the retention period by modifying the
|
||||
<a
|
||||
class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/_help_Gzjqa934BdH4">Configuration (config.ini or environment variables)</a> via the <code>.ini</code> file:</p><pre><code class="language-text-x-trilium-auto">[Logging]
|
||||
class="reference-link" href="#root/_help_Gzjqa934BdH4">Configuration (config.ini or environment variables)</a> via the <code>.ini</code> file:</p><pre><code class="language-text-x-trilium-auto">[Logging]
|
||||
retentionDays=7</code></pre>
|
||||
<p>Or via the environment variable <code>TRILIUM_LOGGING_RETENTION_DAYS</code>.</p>
|
||||
<aside
|
||||
class="admonition note">
|
||||
<p>Special cases:</p>
|
||||
<ul>
|
||||
<li>Positive values indicate the number of days worth of logs to keep</li>
|
||||
<li>A value of 0 results with the default value (90 days) to be used</li>
|
||||
<li>Negative values (e.g. <code>-1</code>) result with all logs to be kept,
|
||||
irrespective how ancient and numerous (and</li>
|
||||
</ul>
|
||||
<aside class="admonition note">
|
||||
<p>If you set the retention days to a low number, you might notice that not
|
||||
all the log files are being deleted. This is because a minimum number of
|
||||
logs (7 at the time of writing) is maintained at all times.</p>
|
||||
</aside>
|
||||
</aside>
|
||||
@@ -5,9 +5,9 @@
|
||||
console is cleared on app restart.</p>
|
||||
<p>If that doesn't work, then:</p>
|
||||
<ul>
|
||||
<li data-list-item-id="e1f836ac8425c0d56072614c40c996bbd">in Trilium desktop app, go to top-left menu button -> Advanced ->
|
||||
<li>in Trilium desktop app, go to top-left menu button -> Advanced ->
|
||||
Open Dev Tools</li>
|
||||
<li data-list-item-id="e8bd27605bedefe884b826a1899413a6d">In Firefox/Chrome right-click anywhere in the page and click Inspect:</li>
|
||||
<li>In Firefox/Chrome right-click anywhere in the page and click Inspect:</li>
|
||||
</ul>
|
||||
<p>
|
||||
<img src="Frontend logs_error-logs-f.png">
|
||||
|
||||
@@ -1 +1,14 @@
|
||||
{}
|
||||
{
|
||||
"keyboard_actions": {
|
||||
"back-in-note-history": "به یادداشت قبلی در تاریخچه",
|
||||
"forward-in-note-history": "به یادداشت بعدی در تاریخچه برو",
|
||||
"open-jump-to-note-dialog": "باز کردن پنجرهٔ «پرش به یادداشت»",
|
||||
"open-command-palette": "باز کردن پالت دستورات",
|
||||
"scroll-to-active-note": "پیمایش درخت یادداشت به یادداشت جاری",
|
||||
"quick-search": "فعالسازی نوار جستجوی سریع",
|
||||
"search-in-subtree": "جستجوی یادداشتها در زیردرخت یادداشت فعال",
|
||||
"expand-subtree": "باز کردن زیردرخت یادداشت جاری",
|
||||
"collapse-tree": "بستن کامل درخت یادداشتها",
|
||||
"collapse-subtree": "بستن زیرشاخههای یادداشت فعلی"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -310,6 +310,46 @@
|
||||
"clone-notes-to": "Cloner les notes vers",
|
||||
"move-notes-to": "Déplacer les notes vers",
|
||||
"copy-notes-to-clipboard": "Copier les notes dans le presse-papiers",
|
||||
"paste-notes-from-clipboard": "Coller les notes depuis le presse-papiers"
|
||||
"paste-notes-from-clipboard": "Coller les notes depuis le presse-papiers",
|
||||
"cut-notes-to-clipboard": "Couper les notes vers le presse-papier",
|
||||
"select-all-notes-in-parent": "Selectionner toutes les notes dans le parent",
|
||||
"add-note-above-to-selection": "Ajouter la note au-dessus à la selection",
|
||||
"add-note-below-to-selection": "Ajouter la note dessous à la selection",
|
||||
"duplicate-subtree": "Dupliquer la sous-arborescence",
|
||||
"open-new-tab": "Ouvrir un nouvel onglet",
|
||||
"close-active-tab": "Fermer l'onglet actif",
|
||||
"reopen-last-tab": "Réouvrir le dernier onglet",
|
||||
"activate-next-tab": "Activer l'onglet suivant",
|
||||
"activate-previous-tab": "Activer l'onglet précédent",
|
||||
"open-new-window": "Ouvrir une nouvelle fenêtre",
|
||||
"toggle-system-tray-icon": "Activer/Désactiver l'icone de la barre d'état",
|
||||
"toggle-zen-mode": "Activer/Désactiver le mode Zen",
|
||||
"switch-to-first-tab": "Aller au premier onglet",
|
||||
"switch-to-second-tab": "Aller au second onglet",
|
||||
"switch-to-third-tab": "Aller au troisième onglet",
|
||||
"switch-to-fourth-tab": "Aller au quatrième onglet",
|
||||
"switch-to-fifth-tab": "Aller au cinquième onglet",
|
||||
"switch-to-sixth-tab": "Aller au sixième onglet",
|
||||
"switch-to-seventh-tab": "Aller au septième onglet",
|
||||
"switch-to-eighth-tab": "Aller au huitième onglet",
|
||||
"switch-to-ninth-tab": "Aller au neuvième onglet",
|
||||
"switch-to-last-tab": "Aller au dernier onglet",
|
||||
"show-note-source": "Afficher la source de la note",
|
||||
"show-options": "Afficher les options",
|
||||
"show-revisions": "Afficher les révisions",
|
||||
"show-recent-changes": "Afficher les changements récents",
|
||||
"show-sql-console": "Afficher la console SQL",
|
||||
"show-backend-log": "Afficher le journal du backend",
|
||||
"show-help": "Afficher l'aide",
|
||||
"show-cheatsheet": "Afficher la fiche de triche",
|
||||
"add-link-to-text": "Ajouter un lien au texte",
|
||||
"follow-link-under-cursor": "Suivre le lien en dessous du curseur",
|
||||
"insert-date-and-time-to-text": "Insérer la date et l'heure dans le texte",
|
||||
"paste-markdown-into-text": "Coller du Markdown dans le texte",
|
||||
"cut-into-note": "Couper dans une note",
|
||||
"add-include-note-to-text": "Ajouter une note inclusion au texte",
|
||||
"edit-read-only-note": "Modifier une note en lecture seule",
|
||||
"add-new-label": "Ajouter une nouvelle étiquette",
|
||||
"add-new-relation": "Ajouter une nouvelle relation"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,11 @@
|
||||
"keyboard_actions": {
|
||||
"back-in-note-history": "Перейти до минулої нотатки в історії",
|
||||
"forward-in-note-history": "Перейти до наступної нотатки в історії",
|
||||
"open-command-palette": "Відкрити палітру команд"
|
||||
"open-command-palette": "Відкрити палітру команд",
|
||||
"scroll-to-active-note": "Прокрутити дерево нотаток до активної нотатки",
|
||||
"quick-search": "Показати панель швидкого пошуку",
|
||||
"search-in-subtree": "Пошук нотаток в піддереві активної нотатки",
|
||||
"expand-subtree": "Розкрити піддерево поточної нотатки",
|
||||
"collapse-tree": "Згорнути все дерево нотаток"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user