gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zadam 2020-07-24 23:14:38 +02:00
commit b60efbbf5a
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/public/app/dialogs/options/advanced.js
View File

@ -19,20 +19,20 @@ const TPL = `
<h4>Anonymize database</h4> <h4>Anonymize database</h4>
<p>This action will create a new copy of the database and anonymise it (remove all note content and leave only structure and some non-sensitive metadata) <p>This action will create a new copy of the database and anonymize it (remove all note content and leave only structure and some non-sensitive metadata)
for sharing online for debugging purposes without fear of leaking your personal data.</p> for sharing online for debugging purposes without fear of leaking your personal data.</p>
<button id="anonymize-button" class="btn">Save anonymized database</button><br/><br/> <button id="anonymize-button" class="btn">Save anonymized database</button><br/><br/>
<h4>Backup database</h4> <h4>Backup database</h4>
<p>Trilium has automatic backup (daily, weekly, monthly), but you can also trigger backup manually here.</p> <p>Trilium has automatic backup (daily, weekly, monthly), but you can also trigger a manual backup here.</p>
<button id="backup-database-button" class="btn">Backup database now</button><br/><br/> <button id="backup-database-button" class="btn">Backup database now</button><br/><br/>
<h4>Vacuum database</h4> <h4>Vacuum database</h4>
<p>This will rebuild database which will typically result in smaller database file. No data will be actually changed.</p> <p>This will rebuild the database which will typically result in a smaller database file. No data will be actually changed.</p>
<button id="vacuum-database-button" class="btn">Vacuum database</button>`; <button id="vacuum-database-button" class="btn">Vacuum database</button>`;

4
src/public/app/dialogs/options/credentials.js
View File

@ -20,7 +20,7 @@ const TPL = `
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="new-password2">New password once more</label> <label for="new-password2">New password Confirmation</label>
<input class="form-control" id="new-password2" type="password"> <input class="form-control" id="new-password2" type="password">
</div> </div>
@ -75,4 +75,4 @@ export default class ChangePasswordOptions {
return false; return false;
} }
} }

8
src/public/app/dialogs/options/other.js
View File

@ -43,7 +43,7 @@ const TPL = `
<h4>Note erasure timeout</h4> <h4>Note erasure timeout</h4>
<p>Deleted notes are at first only marked as deleted and it is possible to recover them <p>Deleted notes are at first only marked as deleted and it is possible to recover them
from Recent Notes dialog. After period of time, deleted notes are "erased" which means from Recent Notes dialog. After a period of time, deleted notes are "erased" which means
their content is not recoverable anymore. This setting allows you to configure the length their content is not recoverable anymore. This setting allows you to configure the length
of the period between deleting and erasing the note.</p> of the period between deleting and erasing the note.</p>
@ -56,8 +56,8 @@ const TPL = `
<div> <div>
<h4>Protected session timeout</h4> <h4>Protected session timeout</h4>
<p>Protected session timeout is a time period after which the protected session is wiped out from <p>Protected session timeout is a time period after which the protected session is wiped from
browser's memory. This is measured from the last interaction with protected notes. See <a href="https://github.com/zadam/trilium/wiki/Protected-notes" class="external">wiki</a> for more info.</p> the browser's memory. This is measured from the last interaction with protected notes. See <a href="https://github.com/zadam/trilium/wiki/Protected-notes" class="external">wiki</a> for more info.</p>
<div class="form-group"> <div class="form-group">
<label for="protected-session-timeout-in-seconds">Protected session timeout (in seconds)</label> <label for="protected-session-timeout-in-seconds">Protected session timeout (in seconds)</label>
@ -68,7 +68,7 @@ const TPL = `
<div> <div>
<h4>Note revisions snapshot interval</h4> <h4>Note revisions snapshot interval</h4>
<p>Note revision snapshot time interval is time in seconds after which new note revision will be created for the note. See <a href="https://github.com/zadam/trilium/wiki/Note-revisions" class="external">wiki</a> for more info.</p> <p>Note revision snapshot time interval is time in seconds after which a new note revision will be created for the note. See <a href="https://github.com/zadam/trilium/wiki/Note-revisions" class="external">wiki</a> for more info.</p>
<div class="form-group"> <div class="form-group">
<label for="note-revision-snapshot-time-interval-in-seconds">Note revision snapshot time interval (in seconds)</label> <label for="note-revision-snapshot-time-interval-in-seconds">Note revision snapshot time interval (in seconds)</label>

6
src/public/app/dialogs/options/sync.js
View File

@ -19,7 +19,7 @@ const TPL = `
<label for="sync-proxy">Sync proxy server (optional)</label> <label for="sync-proxy">Sync proxy server (optional)</label>
<input class="form-control" id="sync-proxy" placeholder="https://<host>:<port>"> <input class="form-control" id="sync-proxy" placeholder="https://<host>:<port>">
<p><strong>Note:</strong> If you leave proxy setting blank, system proxy will be used (applies to desktop/electron build only)</p> <p><strong>Note:</strong> If you leave the proxy setting blank, the system proxy will be used (applies to desktop/electron build only)</p>
</div> </div>
<div style="display: flex; justify-content: space-between;"> <div style="display: flex; justify-content: space-between;">
@ -33,7 +33,7 @@ const TPL = `
<h4>Sync test</h4> <h4>Sync test</h4>
<p>This will test connection and handshake to the sync server. If sync server isn't initialized, this will set it up to sync with local document.</p> <p>This will test the connection and handshake to the sync server. If the sync server isn't initialized, this will set it up to sync with the local document.</p>
<button id="test-sync-button" class="btn">Test sync</button>`; <button id="test-sync-button" class="btn">Test sync</button>`;
@ -78,4 +78,4 @@ export default class SyncOptions {
return false; return false;
} }
} }

2
src/public/app/services/branches.js
View File

@ -75,7 +75,7 @@ async function deleteNotes(branchIdsToDelete) {
const $deleteClonesCheckbox = $('<div class="form-check">') const $deleteClonesCheckbox = $('<div class="form-check">')
.append($('<input type="checkbox" class="form-check-input" id="delete-clones-checkbox">')) .append($('<input type="checkbox" class="form-check-input" id="delete-clones-checkbox">'))
.append($('<label for="delete-clones-checkbox">') .append($('<label for="delete-clones-checkbox">')
.text("delete also all note clones") .text("Also delete all note clones")
.attr("title", "all clones of selected notes will be deleted and as such the whole note will be deleted.")); .attr("title", "all clones of selected notes will be deleted and as such the whole note will be deleted."));
const $nodeTitles = $("<ul>"); const $nodeTitles = $("<ul>");

4
src/public/app/widgets/type_widgets/empty.js
View File

@ -5,9 +5,9 @@ import appContext from "../../services/app_context.js";
const TPL = ` const TPL = `
<div class="note-detail-empty note-detail-printable"> <div class="note-detail-empty note-detail-printable">
<div class="form-group"> <div class="form-group">
<label>Open note by typing note's title into input below or choose a note in the tree.</label> <label>Open a note by typing the note's title into the input below or choose a note in the tree.</label>
<div class="input-group"> <div class="input-group">
<input class="form-control note-autocomplete" placeholder="search for note by its name"> <input class="form-control note-autocomplete" placeholder="search for a note by its name">
</div> </div>
</div> </div>
</div>`; </div>`;

28
src/views/dialogs/help.ejs
View File

@ -21,7 +21,7 @@
<li><kbd data-command="backInNoteHistory"></kbd>, <kbd data-command="forwardInNoteHistory"></kbd> - go back / forwards in the history</li> <li><kbd data-command="backInNoteHistory"></kbd>, <kbd data-command="forwardInNoteHistory"></kbd> - go back / forwards in the history</li>
<li><kbd data-command="jumpToNote"></kbd> - show <a class="external" href="https://github.com/zadam/trilium/wiki/Note-navigation#jump-to-note">"Jump to" dialog</a></li> <li><kbd data-command="jumpToNote"></kbd> - show <a class="external" href="https://github.com/zadam/trilium/wiki/Note-navigation#jump-to-note">"Jump to" dialog</a></li>
<li><kbd data-command="scrollToActiveNote"></kbd> - scroll to active note</li> <li><kbd data-command="scrollToActiveNote"></kbd> - scroll to active note</li>
<li><kbd data-command="activateParentNote"></kbd> - jumps to parent note</li> <li><kbd data-command="activateParentNote"></kbd> - jump to parent note</li>
<li><kbd data-command="collapseTree"></kbd> - collapse whole note tree</li> <li><kbd data-command="collapseTree"></kbd> - collapse whole note tree</li>
<li><kbd data-command="collapseSubtree"></kbd> - collapse sub-tree</li> <li><kbd data-command="collapseSubtree"></kbd> - collapse sub-tree</li>
</ul> </ul>
@ -40,10 +40,10 @@
Only in desktop (electron build): Only in desktop (electron build):
<ul> <ul>
<li><kbd data-command="openNewTab"></kbd> opens empty tab</li> <li><kbd data-command="openNewTab"></kbd> open empty tab</li>
<li><kbd data-command="closeActiveTab"></kbd> closes active tab</li> <li><kbd data-command="closeActiveTab"></kbd> close active tab</li>
<li><kbd data-command="activateNextTab"></kbd> activates next tab</li> <li><kbd data-command="activateNextTab"></kbd> activate next tab</li>
<li><kbd data-command="activatePreviousTab"></kbd> activates previous tab</li> <li><kbd data-command="activatePreviousTab"></kbd> activate previous tab</li>
</ul> </ul>
</p> </p>
</div> </div>
@ -55,8 +55,8 @@
<p class="card-text"> <p class="card-text">
<ul> <ul>
<li><kbd data-command="createNoteAfter"></kbd> - creates new note after the active note</li> <li><kbd data-command="createNoteAfter"></kbd> - create new note after the active note</li>
<li><kbd data-command="createNoteInto"></kbd> - creates new sub-note into active note</li> <li><kbd data-command="createNoteInto"></kbd> - create new sub-note into active note</li>
<li><kbd data-command="editBranchPrefix"></kbd> - edit <a class="external" href="https://github.com/zadam/trilium/wiki/Tree concepts#prefix">prefix</a> of active note clone</li> <li><kbd data-command="editBranchPrefix"></kbd> - edit <a class="external" href="https://github.com/zadam/trilium/wiki/Tree concepts#prefix">prefix</a> of active note clone</li>
</ul> </ul>
</p> </p>
@ -74,9 +74,9 @@
<li><kbd data-command="addNoteAboveToSelection"></kbd>, <kbd data-command="addNoteBelowToSelection"></kbd> - multi-select note above/below</li> <li><kbd data-command="addNoteAboveToSelection"></kbd>, <kbd data-command="addNoteBelowToSelection"></kbd> - multi-select note above/below</li>
<li><kbd data-command="selectAllNotesInParent"></kbd> - select all notes in the current level</li> <li><kbd data-command="selectAllNotesInParent"></kbd> - select all notes in the current level</li>
<li><kbd>Shift+click</kbd> - select note</li> <li><kbd>Shift+click</kbd> - select note</li>
<li><kbd data-command="copyNotesToClipboard"></kbd> - copies active note (or current selection) into clipboard (used for <a class="external" href="https://github.com/zadam/trilium/wiki/Cloning notes">cloning</a>)</li> <li><kbd data-command="copyNotesToClipboard"></kbd> - copy active note (or current selection) into clipboard (used for <a class="external" href="https://github.com/zadam/trilium/wiki/Cloning notes">cloning</a>)</li>
<li><kbd data-command="cutNotesToClipboard"></kbd> - cuts current (or current selection) note into clipboard (used for moving notes)</li> <li><kbd data-command="cutNotesToClipboard"></kbd> - cut current (or current selection) note into clipboard (used for moving notes)</li>
<li><kbd data-command="pasteNotesFromClipboard"></kbd> - pastes note(s) as sub-note into active note (which is either move or clone depending on whether it was copied or cut into clipboard)</li> <li><kbd data-command="pasteNotesFromClipboard"></kbd> - paste note(s) as sub-note into active note (which is either move or clone depending on whether it was copied or cut into clipboard)</li>
<li><kbd data-command="deleteNotes"></kbd> - delete note / sub-tree</li> <li><kbd data-command="deleteNotes"></kbd> - delete note / sub-tree</li>
</ul> </ul>
</p> </p>
@ -89,11 +89,11 @@
<p class="card-text"> <p class="card-text">
<ul> <ul>
<li><kbd data-command="editNoteTitle"></kbd> in tree pane switches from tree pane into note title. Enter from note title switches focus to text editor. <li><kbd data-command="editNoteTitle"></kbd> in tree pane will switch from tree pane into note title. Enter from note title will switch focus to text editor.
<kbd data-command="scrollToActiveNote"></kbd> switches back from editor to tree pane.</li> <kbd data-command="scrollToActiveNote"></kbd> will switch back from editor to tree pane.</li>
<li><kbd>Ctrl+K</kbd> - create / edit external link</li> <li><kbd>Ctrl+K</kbd> - create / edit external link</li>
<li><kbd data-command="addLinkToText"></kbd> - create internal link</li> <li><kbd data-command="addLinkToText"></kbd> - create internal link</li>
<li><kbd data-command="insertDateTimeToText"></kbd> - inserts current date and time at caret position</li> <li><kbd data-command="insertDateTimeToText"></kbd> - insert current date and time at caret position</li>
<li><kbd data-command="scrollToActiveNote"></kbd> - jump away to the tree pane and scroll to active note</li> <li><kbd data-command="scrollToActiveNote"></kbd> - jump away to the tree pane and scroll to active note</li>
</ul> </ul>
</p> </p>
@ -121,7 +121,7 @@
<p class="card-text"> <p class="card-text">
<ul> <ul>
<li><kbd data-command="reloadFrontendApp"></kbd> - reloads Trilium frontend</li> <li><kbd data-command="reloadFrontendApp"></kbd> - reload Trilium frontend</li>
<li><kbd data-command="openDevTools"></kbd> - show developer tools</li> <li><kbd data-command="openDevTools"></kbd> - show developer tools</li>
<li><kbd data-command="showSQLConsole"></kbd> - show SQL console</li> <li><kbd data-command="showSQLConsole"></kbd> - show SQL console</li>
</ul> </ul>