Compare commits

...

1177 Commits

Author SHA1 Message Date
zadam 03f3e46f8b release 0.47.2 2021-04-26 22:32:54 +02:00
zadam 6f1b0b92fe fix searchForNote backend API method 2021-04-26 22:27:12 +02:00
zadam 5e40c03fc9 use Map instead of object where keys can be (reserved) words, fixes #1895 2021-04-26 21:12:46 +02:00
zadam 3b1fb8024f handle undefined in the search ordering 2021-04-26 21:04:22 +02:00
FliegendeWurst 6f49f870ed Exit on SIGTERM (#1891)
Stopping the systemd service running the server now works properly.
2021-04-25 11:05:09 +02:00
zadam b9133cb683 fix keyboard shortcut for "open externally" 2021-04-24 22:18:25 +02:00
zadam ccac46527c opened file change detection now useable on all note types 2021-04-24 21:56:44 +02:00
zadam dcd35b1ea2 fix broken inline PDF viewer, #1833 2021-04-24 20:27:42 +02:00
zadam a74741343e upload of modified open file WIP 2021-04-24 11:39:59 +02:00
zadam 4ff7e0813d upload of modified open file WIP 2021-04-24 11:39:44 +02:00
zadam 6d2d72fa7f add ERR_ADDRESS_UNREACHABLE as expected sync exception, #1888 2021-04-24 10:17:21 +02:00
zadam 30ec706d37 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	package.json
#	src/services/build.js
2021-04-22 21:25:15 +02:00
zadam 25ce2e4253 release 0.46.9 2021-04-22 20:50:22 +02:00
zadam b5674223e5 fixed some incorrect order by behavior, #1881 2021-04-22 20:28:26 +02:00
zadam 02988ed2b3 added random ordering 2021-04-22 19:53:11 +02:00
zadam c27f573eed fix line continuation in the release script 2021-04-22 19:39:57 +02:00
zadam c5b0c60797 Merge remote-tracking branch 'origin/master' 2021-04-21 23:03:16 +02:00
zadam 025af8df02 ckeditor 27.1 2021-04-21 23:03:09 +02:00
chee d9e8cff00f Only add widgets that are executable (#1875)
closes #1874
2021-04-21 22:25:52 +02:00
zadam 1a4f35470c Merge remote-tracking branch 'origin/stable' 2021-04-21 22:04:33 +02:00
zadam 1d99c4e80b fix moving notes with keyboard on Firefox, closes #1865 2021-04-21 22:03:41 +02:00
zadam dc7c64a94d Merge remote-tracking branch 'origin/stable' into stable 2021-04-21 20:38:15 +02:00
zadam dc6a530d8c clear note selection anytime a new note is activated 2021-04-21 20:38:07 +02:00
chee 38b0d05c20 Add .includes to the type check (#1871)
beforehand it would always be `true`
fixes #1869
2021-04-21 20:16:15 +02:00
zadam 6e010dfbd7 fix note preview, closes #1869 2021-04-21 20:14:37 +02:00
zadam 172bdb6118 release 0.47.1-beta 2021-04-19 22:43:03 +02:00
zadam 6136243d61 release 0.47.1-beta 2021-04-19 22:40:50 +02:00
zadam a88a32acae support OPML from MindManager, fixes #1862 2021-04-19 22:33:58 +02:00
zadam 583df35231 log warning about unsucessful login 2021-04-19 21:41:29 +02:00
zadam 634baae796 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/services/build.js
2021-04-19 20:56:56 +02:00
zadam a674a12706 disable tar polluting build log 2021-04-19 20:56:05 +02:00
zadam c29f1af48f use n to force node version
(cherry picked from commit 51d1d8efb8)
2021-04-19 20:51:06 +02:00
zadam 51d1d8efb8 use n to force node version 2021-04-19 20:26:58 +02:00
zadam a8d72c46e4 release 0.46.8 2021-04-18 21:47:45 +02:00
zadam ec36fbd83e release 0.46.8 2021-04-18 21:46:35 +02:00
zadam aedb05cbab release 0.46.8 2021-04-18 21:39:01 +02:00
zadam bb16840a72 release 0.46.8 2021-04-18 21:30:43 +02:00
zadam 7b5d44a329 use official gh client instead of github-release to execute releases 2021-04-18 21:29:10 +02:00
zadam d3cccae2df implemented audio/video in note content renderer + streaming API #886 2021-04-18 12:40:12 +02:00
zadam 9ba514d930 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	package-lock.json
#	trilium.iml
2021-04-18 12:39:19 +02:00
zadam 8e1b8ab26c show not set keyboard shortcuts as "not set", #1851 2021-04-15 21:45:37 +02:00
zadam 197537b159 idea config stuff 2021-04-13 21:54:34 +02:00
zadam 917b259e92 add new sync status "unknown" to differentiate from "can't connect", #1844 2021-04-13 21:54:07 +02:00
zadam a53a65be1f clipper fix, closes #1840 2021-04-12 23:29:02 +02:00
zadam 44aa2834b3 release 0.47.0-beta 2021-04-11 22:29:56 +02:00
zadam 58e4bd4974 Merge remote-tracking branch 'origin/stable' 2021-04-11 22:28:30 +02:00
zadam 44af431a93 ctrl + click / middle click now opens image in a text note in a new tab 2021-04-11 22:24:21 +02:00
zadam 479d742e85 partly reverted wrong change, #1820 2021-04-10 23:24:17 +02:00
zadam 3337487063 fixes 2021-04-10 23:23:43 +02:00
zadam beb42f18fe linux server better-sqlite3 binary 2021-04-10 11:15:13 +02:00
zadam 00a27313fb linux desktop and mac better-sqlite3 binaries 2021-04-09 23:40:42 +02:00
zadam 564fea43a9 don't open new tab after duplicating subtree 2021-04-09 23:40:15 +02:00
zadam 3d3142e20c Merge remote-tracking branch 'origin/master' 2021-04-08 21:22:54 +02:00
zadam 9c679aef20 added #runOnInstance and #runAtHour 2021-04-08 21:22:47 +02:00
Davi Alexandre d47a55d23a Avoid resetting all background properties on note-icons (#1834)
This ensures only the background-color property will be changed transparent,
avoiding to reset any other properties (background-image, for example) that
might have been set by some custom CSS rules applied in combination with
#iconClass
2021-04-08 20:24:19 +02:00
zadam 052f584bf4 edit note button is now just an icon 2021-04-08 20:17:35 +02:00
MatAsmania 1dfebdf6db Fix for Evernote workaround and support for en-todo (#1827) 2021-04-07 22:48:49 +02:00
zadam 5314446980 fix seeing only part of the PDF preview 2021-04-07 22:45:46 +02:00
zadam 6b41c26d2b disable entering new line in the attribute editor 2021-04-07 22:35:06 +02:00
zadam 463071ea4d make global button more consistent with sync button 2021-04-07 22:15:44 +02:00
zadam 79c5645964 various javaDoc improvements 2021-04-07 22:01:52 +02:00
zadam 2f58b6b3c8 fix bottom margin/padding styling in tooltip 2021-04-07 21:21:06 +02:00
zadam e7909d25c6 fix linking to notes 2021-04-07 21:12:55 +02:00
zadam f739dbfe87 ckeditor 5.60.0 2021-04-06 22:16:34 +02:00
zadam c43b20ec2b script api search ignores hoisting by default 2021-04-06 21:56:46 +02:00
zadam 2d0cb5b66e update electron to 13 beta 2021-04-06 20:19:34 +02:00
zadam caf38c94c7 fix search route 2021-04-06 20:18:34 +02:00
zadam 51db6761c8 fix opening links with single click outside of the ckeditor instance 2021-04-06 20:18:16 +02:00
zadam 4d110aa143 updated render note help 2021-04-05 22:37:12 +02:00
zadam 9c436cb61f Merge remote-tracking branch 'origin/stable' 2021-04-05 21:39:35 +02:00
zadam caa11b8f7e fix inheriting inheritable attributes through template, closes #1828 2021-04-05 20:52:19 +02:00
zadam 926e9e12c0 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	package-lock.json
#	package.json
2021-04-05 11:44:42 +02:00
zadam c4d35fb44e fix reference link widget in attr editor after CKEditor 27 upgrade 2021-04-05 11:28:34 +02:00
zadam 1b41b92e02 publish xml2js into backend script api 2021-04-05 11:18:56 +02:00
zadam 41cce4dcb9 improved task manager with allowed year range, #1823 2021-04-04 23:57:55 +02:00
zadam 858072cc10 fix lexer to parse correctly quoted empty strings, #1825 2021-04-04 23:13:18 +02:00
zadam 855c5e0e67 fix unit tests 2021-04-04 22:44:22 +02:00
WPum 903e6b7ccc correct a typo in #1820 fix (#1824)
Thanks!
2021-04-04 22:11:42 +02:00
zadam c71f3c35b8 Merge remote-tracking branch 'origin/stable' 2021-04-04 22:03:00 +02:00
zadam f0cc3d0bcd use entity changes instead of actual tables to fill in sector to sync, fixes #1809 2021-04-04 22:02:40 +02:00
zadam 7672f22ce0 release 0.46.7 2021-04-03 22:37:04 +02:00
zadam ef37a52a06 when leaving protected session don't forget to reset note cache (titles), #1810 2021-04-03 22:02:25 +02:00
zadam 2318d615bb make note cache decryption more robust - one failure will not crash the whole process, #1810 2021-04-03 21:48:16 +02:00
zadam 2e82b7380b hide relationMapLink and template relations from link map, fixes #1820 2021-04-03 11:28:11 +02:00
zadam bc14c3d665 backport not deforming standard top widget in small window size from master 2021-03-31 22:59:07 +02:00
zadam b89ea9a684 check for note cache branch existence, #1808 2021-03-31 22:35:10 +02:00
zadam 6c9ac5b5ec jquery 3.6.0 2021-03-30 23:32:44 +02:00
zadam 9cd45299b1 grid items in note list are clickable as a whole 2021-03-30 23:26:14 +02:00
zadam f1f4f45c9d display note icon in note list 2021-03-30 23:13:16 +02:00
zadam 8644c38abc hide sync status on extra window until the sync status is known 2021-03-30 22:59:25 +02:00
zadam e569ae1a0d one sync status tooltip did not have data-toggle="tooltip" 2021-03-30 22:53:23 +02:00
zadam da741b522e note cache fixes, #1805 2021-03-30 21:39:42 +02:00
zadam e055d4e15e ckeditor 27 2021-03-29 23:29:14 +02:00
zadam 58200d6431 fix dragabilly webpack build 2021-03-29 22:01:01 +02:00
zadam 57db945558 set cssClass and other note related classes on the root widget instead, fixes #1799 2021-03-28 22:24:24 +02:00
zadam 2e6cd5f809 Merge remote-tracking branch 'origin/master' 2021-03-28 00:07:45 +01:00
zadam 6541523e88 empty page on new tab nw offers list of available workspaces 2021-03-28 00:07:38 +01:00
Igor f60b282e09 * Russian README added (#1794)
* * Russian README added

* Links to another READMEs added

* * Fix inline images

Co-authored-by: mopsicus <lii@rstgames.com>
2021-03-27 20:32:01 +01:00
bavis-m 744ed27d91 If the database hasn't been initialized (new install?) don't attempt to update our last synced id, as there is no db to grab it from (prevents running the server as a fresh install completely) (#1797)
Co-authored-by: Mark <mark@mhack.io>
2021-03-27 20:30:40 +01:00
zadam a254199746 Merge remote-tracking branch 'origin/stable' 2021-03-26 21:47:24 +01:00
zadam 496767a52b release 0.46.6 2021-03-25 20:28:57 +01:00
zadam 9139c597e5 use only one label for icon class, fixes #1791 2021-03-25 19:46:10 +01:00
zadam 942132c01d release 0.46.6 2021-03-23 23:57:48 +01:00
zadam 928c8bfdf7 Merge remote-tracking branch 'origin/stable' 2021-03-23 22:47:42 +01:00
zadam 1862acd1ff avoid getting refreshes on note title 2021-03-23 22:46:18 +01:00
zadam ce7e18d0b0 fix syncing protected notes in case there wasn't any other change, closes #1778 2021-03-23 22:18:23 +01:00
zadam 65280d5ba3 avoid ugly error in the logs, #1778 2021-03-22 23:27:41 +01:00
zadam 7e3d424e23 fix deleting all revisions, closes #1774 2021-03-22 23:07:43 +01:00
zadam d5f38c0f88 sync status style fix 2021-03-21 23:45:15 +01:00
zadam 56f97f1081 dragging the tab vertically by 100px will now move it to a new window (chrome like behavior) 2021-03-21 23:35:13 +01:00
zadam e648505ad3 avoid weird button shrinking when window size is too small, fixes #1745 2021-03-21 23:12:34 +01:00
zadam 71c3fd5cbb don't use special layout for "extra window" 2021-03-21 23:05:31 +01:00
zadam f9b0418333 sync status widget tweaks 2021-03-21 22:46:45 +01:00
zadam 392a00ac17 sync status widget 2021-03-21 22:43:41 +01:00
zadam 1a9919a866 sync status widget WIP 2021-03-21 00:01:28 +01:00
zadam 9dd95b62a9 added ScrollingContainer to guarantee scrolling to top when switching notes 2021-03-20 19:44:43 +01:00
zadam 135b4fe88e Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/public/app/layouts/mobile_layout.js
2021-03-20 12:49:37 +01:00
zadam bff04c121a fix scrolling in mobile frontend, closes #1768 2021-03-20 12:47:47 +01:00
zadam b79d81a94d sync status widget WIP 2021-03-20 00:00:49 +01:00
zadam 7e2186721f added "re-render note" menu item & shortcut, closes #1766 2021-03-19 22:34:56 +01:00
zadam 6a70e0ab97 add trilium-no-cert-check bat/shell file in order to be able to connect to the sync server even without valid server certificate 2021-03-18 23:49:28 +01:00
zadam b38a63d336 delete notes dialog provides checkbox to switch between delete all clones and normal delete 2021-03-18 23:42:30 +01:00
zadam d62558d97a delete notes dialog WIP 2021-03-18 23:23:35 +01:00
zadam 76aa7d1451 Merge remote-tracking branch 'origin/master' 2021-03-18 22:11:45 +01:00
zadam 4f401d71a2 Merge remote-tracking branch 'origin/stable' 2021-03-18 21:11:56 +01:00
Patrick Moriarty eb437ff642 Add mobile dropdown for plugin buttons (#1762)
* Add mobile toolbar buttons

* cleanup

* more cleanup

* Mobile plugin buttons: Add else block & change icon
2021-03-18 21:09:08 +01:00
zadam 6edc6e2825 load search result only on explicit action (expand node, execute search), #1759 2021-03-18 21:05:43 +01:00
zadam e8903e82a1 add option to disable note tree auto collapse, fixes #1751 2021-03-18 20:11:58 +01:00
zadam 59e8cb8c8b Merge remote-tracking branch 'origin/stable' 2021-03-17 23:20:28 +01:00
zadam 0cfd95d9b8 not finding node for a note path does not have to be always an error 2021-03-17 23:17:54 +01:00
zadam 1aa5349628 make edit button visible for empty readonly notes, fixes #1760 2021-03-17 22:41:37 +01:00
Patrick Moriarty a4bffbfa60 Mobile view: iOS sizing/styling changes (#1756)
* Fix dark themed action-button text color on mobile safari

* Fix note view scrolling on ios safari

* Fix scroll issues on tree view on ios safari

* Fix mobile firefox/chrome sizing issues

* Fix scroll-to-active-note
2021-03-17 22:07:53 +01:00
zadam 70656d240b better-sqlite3 built for electron 12 windows 2021-03-15 23:49:08 +01:00
zadam 42067b3c1e Merge remote-tracking branch 'origin/stable' 2021-03-15 23:40:44 +01:00
zadam 0bc91da0bb added possibility to zoom into images using mousewheel 2021-03-15 22:24:56 +01:00
zadam 4e21d12202 fix nodejs 10 compatibility, closes #1746 2021-03-15 20:31:12 +01:00
zadam fdce218e88 release 0.46.5 2021-03-14 22:56:27 +01:00
zadam 5b72b577b8 delete notes preview dialog WIP 2021-03-14 22:54:39 +01:00
zadam ec2f8ec796 added subtree note count into info widget 2021-03-14 20:47:33 +01:00
zadam cd3f8a41af removed (112) migrations originating before first public release (0.20 in Sept 2018) 2021-03-14 20:37:35 +01:00
zadam aa8bf0e60a Revert "Revert "delete notes skeleton dialog""
This reverts commit 584fea19
2021-03-14 19:54:40 +01:00
zadam 5b3a6b5e9d Merge remote-tracking branch 'origin/stable' 2021-03-14 19:53:51 +01:00
zadam 6c8d20288d fix 0.46 regression to set up sync from client, fixes #1742 2021-03-13 22:54:00 +01:00
zadam 88d04772c4 make sure the CLS entity changes are cleared after roll backed transaction, #1736 2021-03-12 23:48:14 +01:00
zadam 9fd26a9b9f when creating new note into inbox use current hoisted note in new tab as well 2021-03-12 21:47:26 +01:00
zadam 98f02c3c9a added "hoistedInbox" label 2021-03-12 21:29:50 +01:00
zadam 584fea1992 Revert "delete notes skeleton dialog"
This reverts commit 03a11e6f
2021-03-12 20:44:19 +01:00
zadam af50a1ec52 Merge remote-tracking branch 'origin/stable' into stable 2021-03-12 20:39:51 +01:00
zadam 4e76d1fa85 hide some "boring" attributes from book listing view 2021-03-12 20:39:42 +01:00
zadam 81e226af6f Merge remote-tracking branch 'origin/stable' 2021-03-12 20:27:05 +01:00
zadam 03a11e6f77 delete notes skeleton dialog 2021-03-11 22:35:53 +01:00
zadam cb558e1378 Merge remote-tracking branch 'origin/stable' 2021-03-11 21:14:58 +01:00
zadam e1a16b4a9f defensive check, #1736 2021-03-11 20:28:07 +01:00
zadam 12b468d3dc release 0.46.4-beta 2021-03-10 23:35:12 +01:00
zadam 6f901e6852 use icons instead of plain text to differentiate between different paths in note paths widget 2021-03-10 23:11:48 +01:00
zadam 09e9ac4d00 prevent cycles in resolving the notepath, fixes #1730 2021-03-10 22:54:55 +01:00
zadam 723a0e479e ckeditor 26.0 2021-03-10 20:02:23 +01:00
zadam 5b8e876b77 upgrade to electron 12 2021-03-09 22:36:41 +01:00
zadam a33ac65fdf fix focus on moving notes with keyboard 2021-03-09 22:24:59 +01:00
zadam f8fb071a6f added option to bring back plain (non-markdown) headings, closes #1678 2021-03-09 22:06:40 +01:00
zadam a654078e56 fix broken template copy, closes #1724 2021-03-09 20:51:57 +01:00
zadam fba68681aa when resolving note path check if there's a hoisted note in it, if not, try again to find some path with hoisted note, closes #1718 2021-03-09 20:37:56 +01:00
zadam 50c84e0f5f release 0.46.3-beta 2021-03-08 23:11:11 +01:00
zadam f27370d44f fix putting focus back to the note tree after note deletion 2021-03-08 23:10:34 +01:00
zadam c6c9202c00 fix note icon color in dark mode 2021-03-08 22:06:26 +01:00
zadam 2cafda5f66 note paths visually distinguishes between different note paths, closes #1669 2021-03-08 22:04:52 +01:00
zadam 873953cbaf fix bug 2021-03-08 00:09:48 +01:00
zadam d51744ce19 make note paths current path underlined 2021-03-08 00:07:00 +01:00
zadam 7df8c940b6 have paths in "note paths" widget also sorted by priority 2021-03-08 00:04:43 +01:00
zadam 9bac2a4819 refresh inherited attribute list after attr change, closes #1717 2021-03-07 23:31:56 +01:00
zadam 88147f7a0a fixed "create note after" position issue 2021-03-06 23:53:10 +01:00
zadam ca77211b38 improved template code with better heuristics on when to copy things from the template 2021-03-06 21:34:03 +01:00
zadam 4606e8d118 non-search notes should have no children limit, #1673 2021-03-06 20:31:12 +01:00
zadam 9f002fa802 change the heuristics to choose the best note path when ambiguous/incomplete/just noteId is provided, #1711 2021-03-06 20:23:29 +01:00
zadam 060d4fc27b fix duplication of hoisted note tree when hoisted note has clones 2021-03-04 23:19:27 +01:00
zadam bf0fbe201e hack when hoisted note is cloned then it could be filtered multiple times while we want only 1 2021-03-03 23:00:16 +01:00
zadam 721e5da672 use notePath instead of noteId for note creation to correctly work with cloned ancestors 2021-03-03 22:48:06 +01:00
zadam 8192b51b8a cleanup of createTopLevelNote 2021-03-03 22:27:57 +01:00
zadam 73514a63d8 when resolving note path attempt to find one going through hoisted note 2021-03-03 21:49:57 +01:00
zadam f8c310eb8f added license mention into the README noting AGPL v3+, #1708 2021-03-03 21:41:44 +01:00
zadam b9422b0efd cssClass is now added also to link map and relation map, closes #1702 2021-03-02 23:20:53 +01:00
zadam 14ced949a9 fix modifying index in note cache when deleting attribute, closes #1706 2021-03-02 23:10:42 +01:00
zadam 5b5c2a2dbb fix null utcDateChanged in entity_changes, closes #1705 2021-03-02 22:08:29 +01:00
zadam 2c958eaacb Merge branch 'sort-by' 2021-02-28 23:40:37 +01:00
zadam 4aa27b6033 added "sort by" dialog 2021-02-28 23:40:15 +01:00
zadam 89a0c5a1c9 fix "no data" when switching between tabs with different hoisted notes, closes #1699 2021-02-28 19:46:04 +01:00
zadam 78e48095e6 prompt user when there are unsaved changes, #1692 2021-02-27 23:39:02 +01:00
zadam 02016ed031 fix create full search note 2021-02-27 21:19:54 +01:00
zadam cb91dadeca add possibility to define search home for hoisted notes, #1694 2021-02-27 21:18:10 +01:00
zadam 2c755bcc38 don't fail (immediatelly) when sql insert doesn't return lastInsertRowid, #1665 2021-02-27 21:09:13 +01:00
zadam 3c7a6bc1e4 use longer update interval for web 2021-02-27 21:08:27 +01:00
zadam 3fe87259e2 if search note would end up outside of current hoisting, save it under the hoisted note, closes #1694 2021-02-26 23:33:22 +01:00
zadam d476dfc53b fix searching the second time in quick search, #1694 2021-02-26 23:20:49 +01:00
zadam 19821b634f release 0.46.2-beta 2021-02-25 22:41:35 +01:00
zadam cde41b268e allow copying type, mime, content from template only for text and code note types, fixes #1689 2021-02-25 22:33:26 +01:00
zadam 1c59bc4d3c sort child notes by ... WIP 2021-02-25 22:26:46 +01:00
zadam cb6d35236c update correctly "multi-parent" node status, fixes #1688 2021-02-25 21:16:21 +01:00
zadam 7572ee284b set search note title correctly during creation 2021-02-25 20:02:49 +01:00
zadam d0eaf623a8 activate node after calling "scroll to active note", fixes #1685 2021-02-24 22:41:24 +01:00
zadam 25c2db6c3a sort parent relationships so that clones in search notes appear last, fixes #1686 2021-02-24 22:38:26 +01:00
zadam 5a173ff14e quick search now allows clicking anywhere 2021-02-24 22:19:09 +01:00
zadam 7fab75b085 Merge remote-tracking branch 'origin/master' 2021-02-23 22:01:10 +01:00
zadam 0f065536d0 use 100 children limit on only search notes (as was initially intended), fixes #1673 2021-02-23 22:01:02 +01:00
sigaloid d0747abded no h1 headings (#1679)
#1552
2021-02-23 21:23:23 +01:00
Mirwaisse Djanbaz f62b4a581e Typo in export.js (#1682) 2021-02-23 21:20:19 +01:00
Mirwaisse Djanbaz dcf1c62ec1 Typo in appearance settings (#1683) 2021-02-23 21:19:57 +01:00
zadam 93d55b3e7b put back waiting for sync after frontend API backend request 2021-02-22 22:43:54 +01:00
zadam 90c6852423 hide auto links by default in relation map, allow configuring displayed relations, fixes #1674 2021-02-22 22:34:33 +01:00
zadam 208baa56e9 error handling 2021-02-22 21:59:37 +01:00
zadam ddf8438b22 fix edited notes widget note transitions, fixes #1672 2021-02-21 22:45:32 +01:00
zadam 6008dc891f fix note activation right after creation from calendar 2021-02-21 21:54:16 +01:00
zadam cc887a00f2 runOnBackend now does not automatically wait for the maxSyncId since it can easily result in infinite cycle 2021-02-21 21:28:00 +01:00
zadam fbbd51d0b1 small changes for better debugging infos 2021-02-20 23:17:29 +01:00
zadam 081b8b126a fix note_reordering not updating note cache 2021-02-20 21:28:22 +01:00
zadam 7a6bb81345 display note path in search results 2021-02-20 20:10:45 +01:00
zadam 1d5714c411 release 0.46.1-beta 2021-02-19 23:15:18 +01:00
zadam 56506d33a7 small fixes 2021-02-19 22:58:53 +01:00
zadam c94fb7a62d created a specific widget for search result to add "no results" message 2021-02-19 22:15:56 +01:00
zadam 4160da70be implemented "targetRelationCount" and exposed more of them in order by widget, fixes #1658 2021-02-19 20:42:34 +01:00
zadam 2cfd093cae allow search result to be moved from tree to relation map, fixes #1650 2021-02-18 22:30:55 +01:00
zadam 859465841d add possibility to debug search queries by logging expression tree, #1655 2021-02-18 22:10:49 +01:00
zadam 0c9a11db6f bring back "create and link note" into more places, fixes #1653 2021-02-18 20:10:44 +01:00
zadam 4cbf9c2e86 show "reset to default icon" button only when there is an explicit icon 2021-02-18 20:06:14 +01:00
zadam 1f7997eeed added "reset to default icon" button to icon picker 2021-02-18 19:33:12 +01:00
zadam 8e730c6ecf add frontend API method openTabWithNote, #1645 2021-02-17 23:55:51 +01:00
zadam 600a312b2a fix parsing of "!=" operator, #1651 2021-02-17 23:41:15 +01:00
zadam ec2e973165 allow only valid attr name characters for relation map relations, closes #1649 2021-02-17 23:22:14 +01:00
zadam faeb55bc90 don't allow to bring up delete dialog on saved search results (consistency with context menu) 2021-02-17 23:03:34 +01:00
zadam 23ebe360a6 small fixes 2021-02-17 20:59:44 +01:00
zadam d905335935 correct placement of imported root note (at the end) 2021-02-16 23:38:05 +01:00
zadam f49f510459 fixes in "other notes with relation..." 2021-02-16 23:07:40 +01:00
zadam e78b495bd3 reduce flickering of import by disabling entityChanges notification of frontend 2021-02-16 22:51:00 +01:00
zadam 5542c9dc57 fixed saved note migration - need to be migrated as last, #1647 2021-02-16 21:40:17 +01:00
zadam 2388da7cfb fixed "show in full search" click and keyboard shortcuts for collapse tree and scroll to active note actions, #1647 2021-02-16 21:19:07 +01:00
zadam 3b4fa0c5fc update section container on attribute change, closes #1646 2021-02-16 20:58:17 +01:00
zadam 1af98056bb release 0.46.0-beta 2021-02-15 22:29:35 +01:00
zadam c0edcc1bfe split icon list data into separate file 2021-02-15 22:18:37 +01:00
zadam 597e595c32 filtering for the icon picker 2021-02-15 22:11:38 +01:00
zadam e212a37c84 fixes for SQL console 2021-02-15 20:44:55 +01:00
zadam c41448f5da consistency check for wrong lastSyncedPush 2021-02-15 20:44:31 +01:00
zadam aab49946f8 prototype of note icon picker 2021-02-14 23:27:28 +01:00
zadam cc4d04416b added "delete note revisions" search action 2021-02-14 21:35:13 +01:00
zadam 66c5606d46 implemented "rawContent", #1637 2021-02-14 19:27:31 +01:00
zadam 50bcf45113 fixed "duplicate subtree" creating extra entities in case subtrees contains multiple clones 2021-02-14 12:14:33 +01:00
zadam 08cba1e1ce fixed "duplicate subtree" 2021-02-14 11:43:31 +01:00
zadam f528799fed added "limit" search modifier to search definition 2021-02-13 23:52:52 +01:00
zadam a78c8ddad7 small search help improvements 2021-02-13 23:38:31 +01:00
zadam 3cc93157bf basic support for audio/video preview in file notes (no seeking) 2021-02-13 23:20:22 +01:00
zadam 3dbd80d5a6 relocated note paths widget into note title row 2021-02-13 22:47:06 +01:00
zadam 076b4a6651 small tweaks 2021-02-13 21:52:31 +01:00
zadam 378987e61c added icon to note title row 2021-02-13 20:07:08 +01:00
zadam 5eb850bf59 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/services/search/services/search.js
2021-02-13 12:27:10 +01:00
zadam 4914160590 fix correct application of <small> tag, closes #1635 2021-02-13 12:23:50 +01:00
zadam 00c106aba6 fix update of value from autocomplete, #1557 2021-02-13 12:11:58 +01:00
zadam 5e6d2c8336 db migration fix 2021-02-12 23:52:16 +01:00
zadam d45a59aa4e sync fixes 2021-02-12 23:30:11 +01:00
zadam 9f19cf8046 don't sync recent_notes 2021-02-12 22:39:38 +01:00
zadam c0dfd23191 fix merge conflict 2021-02-11 23:08:37 +01:00
zadam b9539117d8 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/services/auth.js
#	src/services/setup.js
2021-02-11 23:07:20 +01:00
zadam d616a77d6b release 0.45.10 2021-02-11 23:05:48 +01:00
zadam 5b679930de revert accidentally committed auth changes, #1629 2021-02-11 23:04:42 +01:00
zadam 3d7beefad0 sync fixes 2021-02-11 22:50:32 +01:00
zadam 8850de51f5 sync fixes 2021-02-10 22:56:23 +01:00
zadam 18b13657fd don't compare hashes of note_reordering entity_changes 2021-02-09 23:27:09 +01:00
zadam 43ac712fca fix searchForNotes API method to look for archived notes as well 2021-02-09 22:32:25 +01:00
zadam bf231d31a2 fancytree 2.38.0 2021-02-09 21:33:55 +01:00
zadam 7dd19c0366 correct reloading of note subtree when relevant labels change 2021-02-09 20:26:10 +01:00
zadam 0040334e89 fix infinite cycle when template is descendant of an instance 2021-02-09 20:15:14 +01:00
zadam 96a5cb23f3 Merge remote-tracking branch 'origin/stable' 2021-02-08 21:16:14 +01:00
zadam 067ca9ab16 fallback for incorrectly parsed pane widths, #1621 2021-02-08 20:51:38 +01:00
zadam be65e2e62f fixed custom header authentication 2021-02-07 21:50:34 +01:00
zadam bed7bdfd00 "move to new window" respects note hoisting of original tab 2021-02-07 21:27:09 +01:00
zadam cd5be59413 tab row is detecting workspace changes 2021-02-07 20:55:49 +01:00
zadam 2a67d9eae2 added unhoist button to the tree node + onclick fixes 2021-02-06 19:58:12 +01:00
zadam 0f05d6258e small fixes 2021-02-05 23:19:43 +01:00
zadam 45516fa7b4 Merge remote-tracking branch 'origin/stable' 2021-02-05 22:54:50 +01:00
zadam 70708b36ef using custom header for sync authorization to avoid tripping security proxies 2021-02-05 21:59:56 +01:00
zadam fb3d5f25ac release 0.45.9 2021-02-05 21:38:32 +01:00
zadam 397f0d1326 fix collapse tree 2021-02-04 23:08:16 +01:00
zadam 6469937393 fix note tree flickering (note cache was not updated when expanded status changed) 2021-02-04 22:05:32 +01:00
zadam 48cb4d2ab9 one line overflow for note properties 2021-02-02 23:36:27 +01:00
zadam 3a94b04ef4 quick search impl finished 2021-02-01 23:51:04 +01:00
zadam d406df48a8 edited notes doesn't wrap long note titles 2021-02-01 20:55:35 +01:00
zadam 9447d3f9b5 quick search widget WIP 2021-01-31 22:45:45 +01:00
zadam 2ac78c2e03 global menu does not need "menu" title 2021-01-31 20:36:30 +01:00
zadam 17073096cf disable property widgets if not applicable 2021-01-31 20:07:56 +01:00
zadam 6068bd7c44 added note properties widget 2021-01-31 12:15:36 +01:00
zadam 56a35b85a6 Merge remote-tracking branch 'origin/stable' 2021-01-30 22:49:19 +01:00
zadam 9d7d79ef94 avoid errors from missing note cache during startup 2021-01-30 22:25:40 +01:00
zadam eb1a6b78ff updated schema 2021-01-30 22:17:29 +01:00
zadam 60d000b9cb VACUUM for migration 2021-01-30 22:12:38 +01:00
zadam 61ddd8afc6 small fixes to migration scripts 2021-01-30 22:00:09 +01:00
zadam 69bdcdd74a changed sidebar widget expanders to be consistent with tree expanders 2021-01-30 21:28:10 +01:00
zadam 17c6f53397 fix "twitching" tree nodes on hover 2021-01-30 21:03:39 +01:00
zadam 1c51419db5 image properties converted to collapsible section container 2021-01-30 20:21:44 +01:00
zadam 1ba1f28006 let's try "display: flex" fix for the include note positioning bug, #1590 2021-01-30 20:07:56 +01:00
zadam 6b306ac426 alert for missing file preview 2021-01-30 15:59:59 +01:00
zadam ae26f22114 class moving 2021-01-30 15:50:46 +01:00
zadam 552d213817 file properties converted to collapsible section container 2021-01-30 15:47:24 +01:00
zadam 8fb7dd451e small fixes 2021-01-30 11:50:45 +01:00
zadam 01a82bed09 extra window layout updated to be consistent with main window 2021-01-29 23:36:33 +01:00
zadam 77bc5f9944 disabling tree expand animation to avoid "recursion" errors 2021-01-29 23:33:41 +01:00
zadam 6081c3540e refactoring 2021-01-29 22:44:59 +01:00
zadam 0a10764ed4 Merge remote-tracking branch 'origin/stable' 2021-01-29 21:19:48 +01:00
zadam ba33a0d330 fix conflict between CKEditor build content style and externally provided content style (which are not needed when build CSS is available), #1590 2021-01-29 20:27:16 +01:00
zadam aea81c9872 fix include note rendering over floating elements, #1590 2021-01-29 20:09:03 +01:00
zadam 8019e23ee4 note list displays correct paging 2021-01-28 23:29:10 +01:00
zadam 5eb9b8fe42 included notes are not displayed in children overview 2021-01-28 23:15:58 +01:00
zadam d19a929237 removed auto book as it is no longer needed 2021-01-28 22:34:35 +01:00
zadam 67e0e0888e Merge remote-tracking branch 'origin/stable' 2021-01-28 22:17:46 +01:00
zadam 810fd9e819 fix glitches on drag & drop, fixes #1587 2021-01-28 21:19:01 +01:00
zadam 2dc742f5b8 don't recompress animated images, #1585 2021-01-28 20:17:57 +01:00
zadam 48b7108da0 add meta theme-color tag to mobile version, #1576 2021-01-27 20:58:20 +01:00
zadam 806ab22fa8 hide note paths dropdown on changed note, #1572 2021-01-27 20:44:58 +01:00
zadam fbabdef272 added ancestor depth search criteria 2021-01-26 23:25:18 +01:00
zadam a1f67e830d search script UI 2021-01-26 22:22:17 +01:00
zadam ee78413ecb improvements to the search spec 2021-01-26 15:54:41 +01:00
zadam b936a63db3 improvements to the search spec help button 2021-01-26 14:44:53 +01:00
zadam 80354d09fb search definition more fixed layout 2021-01-26 14:10:34 +01:00
zadam 87925f72a3 search definition action refactoring 2021-01-26 10:48:28 +01:00
zadam 898c941333 search definition refactoring 2021-01-26 10:42:55 +01:00
zadam 8b0a1e546d search fixes 2021-01-25 23:43:36 +01:00
zadam ec351137d4 search definition refactoring 2021-01-25 21:24:02 +01:00
zadam cf5127dcec split up search definition options to more classes 2021-01-24 22:30:53 +01:00
zadam 345de752d1 Merge remote-tracking branch 'origin/stable' 2021-01-23 21:53:21 +01:00
zadam 9c2b98915e fix glitch in switching between different types of notes 2021-01-23 21:52:39 +01:00
zadam 7b0fd639f6 improved heuristic of displaing attributes in note list and tooltips #1558 2021-01-23 21:41:02 +01:00
zadam 6408a47a8a Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/services/note_cache/entities/note.js
2021-01-23 21:09:47 +01:00
zadam f2ca9276d6 fix/improve behavior of "sorted" attribute 2021-01-23 21:00:59 +01:00
zadam 872e81fe1f search now supports searching / ordering by note size 2021-01-22 22:20:17 +01:00
zadam 480aec1667 size calculation is always on demand 2021-01-22 15:16:08 +01:00
zadam 35ea877c7d Merge remote-tracking branch 'origin/stable' 2021-01-21 22:06:17 +01:00
zadam 41ca4b8d2e fix relation map view 2021-01-21 22:05:56 +01:00
zadam 8375a1b5ab optimize usage of note path and attributes in the note tooltip, #1558 2021-01-21 21:48:06 +01:00
zadam 48b697f408 select attr name in attr detail dialog did not trigger update, closes #1557 2021-01-21 20:18:33 +01:00
zadam c33d496cf3 note info widget provides basic info on note (and subtree) size 2021-01-21 20:02:40 +01:00
zadam 200982655f WIP for counting note and subtree size 2021-01-20 22:17:40 +01:00
zadam d67e1552ee more impl for search actions 2021-01-20 21:45:30 +01:00
zadam ce09e4a1eb basic backend implementation of search actions 2021-01-20 20:31:24 +01:00
zadam 7bf6ec3ff2 bootstrap 4.6.0 2021-01-19 22:28:43 +01:00
zadam 1f923403de UI for search actions (WIP) 2021-01-19 22:10:24 +01:00
zadam cb2361e9c4 Merge remote-tracking branch 'origin/master' 2021-01-19 19:45:57 +01:00
zadam d7e46263be UI fixes to search definition + backend support 2021-01-18 22:52:07 +01:00
王登辉 138903cf28 fix config.ini Network host not work (#1546) 2021-01-18 17:46:48 +01:00
zadam 3fa2535862 basic interactivity of search definition actions 2021-01-17 23:01:01 +01:00
zadam 5bb490e1ff basic interactivity of search definition 2021-01-17 21:11:01 +01:00
zadam f2e44e5617 fix tree's enhanced item buttons 2021-01-15 23:05:19 +01:00
zadam 58a93f748b Merge remote-tracking branch 'origin/stable' 2021-01-15 22:23:56 +01:00
zadam e1e185e5db added "safe mode" environment variable switch which disables startup scripts and resets tabs 2021-01-15 20:12:14 +01:00
zadam 199b49c1f7 fix partial syncs 2021-01-14 23:22:13 +01:00
zadam cbc1f63732 Merge remote-tracking branch 'origin/stable' 2021-01-14 21:53:05 +01:00
zadam 3f2e8717b3 sanitize also clipper content, #1532 2021-01-14 21:52:44 +01:00
zadam e06c5703ee config value to disable backups, closes #1533 2021-01-12 21:50:05 +01:00
zadam cd858a73c1 Merge remote-tracking branch 'origin/stable' 2021-01-11 22:49:08 +01:00
zadam 69353f12b5 partial sync requests WIP 2021-01-11 22:48:51 +01:00
zadam fe3bb2c5f6 release 0.45.8 2021-01-11 22:47:11 +01:00
zadam 6afc299efb release 0.45.8 2021-01-11 22:29:31 +01:00
zadam 369274ead7 new env variable to specify start note, #1532 2021-01-11 22:29:02 +01:00
zadam 7f8b19aee4 WIP partial sync requests 2021-01-10 21:56:40 +01:00
zadam cd653b9f0c add link dialog should recognize external links, closes #1521 2021-01-08 21:44:43 +01:00
zadam 9fcd659df4 mock up of search definition changes 2021-01-08 19:57:49 +01:00
zadam c08c4531db fix empty range items handling 2021-01-05 14:24:25 +01:00
zadam f8bec35893 use selected text to apply filtering for add link dialog, closes #1515 2021-01-05 14:22:11 +01:00
zadam 04e6431c09 use correct class in exported HTMLs so that content style is applied, #1504 2020-12-30 23:20:12 +01:00
zadam 7aadd57d2f search help dropdown button 2020-12-30 23:09:29 +01:00
zadam 02d9752abf refactoring of sql console into separate widgets 2020-12-29 22:27:31 +01:00
zadam 1d64129572 lazy loading of note list 2020-12-27 22:19:27 +01:00
zadam e89057a771 search note content only if not excluded by other expressions 2020-12-25 20:46:04 +01:00
zadam 95760f1d28 don't display similar notes under search 2020-12-25 13:06:58 +01:00
zadam 75c3bd8ae3 Merge remote-tracking branch 'origin/stable' 2020-12-25 13:02:05 +01:00
zadam 4f27254e64 fix top margin of images and tables which can obscure their handles 2020-12-25 13:01:35 +01:00
zadam 479d6ba964 Merge remote-tracking branch 'origin/stable' 2020-12-25 12:56:34 +01:00
zadam 577dc95ab8 convert &nbsp; into whitespace also for large notes 2020-12-25 12:55:16 +01:00
zadam a266d6a3d5 don't strip tags for very large text notes, #1500 2020-12-24 23:37:21 +01:00
zadam 749b6cb57e don't strip tags for very large text notes, #1500 2020-12-24 23:33:42 +01:00
zadam 9f472b353a simplified table stats 2020-12-23 21:22:41 +01:00
zadam 4c614aee90 note paths CSS tweaks 2020-12-23 21:03:01 +01:00
zadam f17be0ef9b Merge remote-tracking branch 'origin/stable' 2020-12-22 22:38:37 +01:00
zadam b0b2951ff6 cleanup 2020-12-22 22:30:04 +01:00
zadam 1f3d73b9fd release 0.45.7 2020-12-22 20:21:15 +01:00
zadam 7dde78e98a Merge remote-tracking branch 'origin/stable' 2020-12-21 23:19:25 +01:00
zadam bdfd760b9d fixed some encryption issues 2020-12-21 23:19:03 +01:00
zadam 8c0662ab82 fix displaying protected notes outside of protected session 2020-12-21 23:10:08 +01:00
zadam cc3addebd4 date notes respect their parent's isProtected status, #1483 2020-12-21 23:00:39 +01:00
zadam 7133e60267 make encryption more robust in face of null values, #1483 2020-12-21 22:08:55 +01:00
zadam fc4edf4aa7 better comment for instanceName 2020-12-21 21:05:34 +01:00
zadam eaf93a70cd fix inverse relation creation, closes #1498 2020-12-21 20:55:01 +01:00
zadam a1b2e22ba5 add possibility to add whole iso date as date pattern, #1496 2020-12-20 22:49:42 +01:00
zadam f8936f3bc8 use trilium.sid as a session ID to avoid session ID conflicts 2020-12-20 22:20:21 +01:00
Steven Tang 015c9d2ccd rename session cookie from connect.sid to trilium (#1495)
to prevent collisions with other express-session apps
2020-12-20 22:18:57 +01:00
zadam 95ccfd2521 use bootstrap default monospace fonts for code notes, fixes #1489 2020-12-18 22:37:29 +01:00
zadam 6c15d299e0 isErased fixes 2020-12-18 22:35:40 +01:00
zadam b093569ec5 increase toast size limit 2020-12-18 21:23:51 +01:00
zadam f8089ba370 fixed saved search refresh 2020-12-17 21:19:52 +01:00
zadam 053162fef2 bootstrap 4.5.3 2020-12-17 15:20:20 +01:00
zadam 71bbf2eb16 close note type dropdown after click 2020-12-17 15:19:22 +01:00
zadam f723433970 fix deleting notes 2020-12-17 15:04:04 +01:00
zadam 1cc7917b6e renamed remnants of "sync" to "entity_change" 2020-12-16 22:17:42 +01:00
zadam cdc2721ac1 DB migration fixes 2020-12-16 20:58:43 +01:00
zadam 4a15127e58 removal of isErased from old entities 2020-12-16 15:05:36 +01:00
zadam c5ec57e08e cleanup of isErased obsolete usage 2020-12-16 15:01:20 +01:00
zadam d0578971f7 fix manual erasing note revisions 2020-12-16 14:36:24 +01:00
zadam 1b0bb22273 drop isDeleted index 2020-12-15 15:30:46 +01:00
zadam bf653a9a5c ckeditor 24 content styles 2020-12-15 15:18:45 +01:00
zadam 5467dc62cd extra case sensitivity tests 2020-12-15 15:15:41 +01:00
zadam 96eff4c410 fixed search tests 2020-12-15 15:09:00 +01:00
zadam 3a12181a57 search fixes WIP 2020-12-14 23:59:05 +01:00
zadam fccce2ff1e small fixes 2020-12-14 23:04:56 +01:00
zadam c949dcb449 fixes and optimizations 2020-12-14 22:12:26 +01:00
zadam 8b99f065d5 fixes of recent entity changes 2020-12-14 14:17:51 +01:00
zadam 6d7b9e0db3 erasing rows of deleted entities 2020-12-14 13:58:02 +01:00
zadam 248fa780e8 erasing rows of deleted entities 2020-12-14 13:47:33 +01:00
zadam 20c7c657da moving isErased into entity_changes 2020-12-14 13:15:32 +01:00
zadam 0a896cc19c tree fixes 2020-12-13 23:27:42 +01:00
zadam 0bb548d0d1 ckeditor 24 2020-12-13 20:27:57 +01:00
zadam de1584eab8 note list improvements 2020-12-13 20:13:57 +01:00
zadam 60e2026850 improved note list pager for many pages 2020-12-12 12:07:15 +01:00
zadam 5098dda376 load initial tree from note cache 2020-12-11 22:06:12 +01:00
zadam 35e47f866a fix root branch 2020-12-11 15:27:57 +01:00
zadam 199d89c1a6 optimizations and fixes 2020-12-11 15:24:44 +01:00
zadam be543737a9 sorting search results occurences in the note title 2020-12-11 13:54:41 +01:00
zadam 0b6fa4ab06 Merge remote-tracking branch 'origin/optimize-tree' 2020-12-10 22:54:16 +01:00
zadam 8f1b2fa226 move entity hash to entity_changes table 2020-12-10 22:53:52 +01:00
zadam 5010175b84 adding few missing isErased = 0 conditions 2020-12-10 21:56:48 +01:00
zadam 0ac42608f7 faster tree loading of many notes at once #1480 2020-12-10 21:27:21 +01:00
zadam 4633c68a0c avoid resorting children on every child add, fixes #1480 2020-12-10 16:10:10 +01:00
zadam 33571e0ef3 better logging for un/protect errors 2020-12-09 22:49:55 +01:00
zadam 31876d2cf9 fix automatically scheduled note deletion 2020-12-09 22:45:34 +01:00
zadam 81c6043cb6 fix printing notes with math, closes #1484 2020-12-09 21:59:30 +01:00
zadam 7f3ef2cb8b move entity hash to entity_changes table WIP 2020-12-07 23:04:17 +01:00
zadam 1982d054ef inherit also note type and mime from template note, closes #1475 2020-12-07 09:35:39 +01:00
zadam 16c4b8aa43 added also "sqlConsoleHome" 2020-12-07 09:19:27 +01:00
zadam e56979c482 add button to erase deleted notes now into the options 2020-12-06 22:11:49 +01:00
zadam 4078b32e9d fix "show in full text search" in jump to note dialog 2020-12-05 23:19:02 +01:00
zadam 90d33f56c3 implemented "search in subtree" 2020-12-05 23:00:28 +01:00
zadam b0e5ab7533 smaller search improvements 2020-12-04 22:57:54 +01:00
zadam 526bd81b50 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/public/app/widgets/attribute_list.js
2020-12-04 22:09:27 +01:00
zadam 58555b3660 release 0.45.6 2020-12-04 22:08:24 +01:00
zadam b7b1324dd0 fixed disabled prefix in case of unsafe import to conform to new attribute name pattern constraints 2020-12-04 22:05:29 +01:00
zadam a1fb84f14d unification of tooltip and note list renderers 2020-12-03 22:54:24 +01:00
zadam bc520edd19 fix usage of async .getHeaders() 2020-12-03 21:50:41 +01:00
zadam 5f4f0d3086 experimental markdown-like headings 2020-12-01 22:01:58 +01:00
zadam a68c61b2f0 improvements to saved search 2020-11-30 23:20:12 +01:00
zadam 2a6978c349 added button for entering workspace 2020-11-29 22:32:31 +01:00
zadam 1c5425c9eb workaround for filter + create child problems 2020-11-29 20:55:24 +01:00
zadam 2338a13749 added "add child note" button to note tree 2020-11-27 23:13:48 +01:00
zadam 6df6fe03fa fix display of attr detail 2020-11-27 22:38:15 +01:00
zadam e318acc977 fix incorrectly set isInheritable on inherited attrs 2020-11-27 22:33:33 +01:00
zadam b0217ee04c added new "create note" button 2020-11-27 22:21:13 +01:00
zadam 2a54ce803e layout tweaks 2020-11-27 22:02:55 +01:00
zadam 642bf9d113 layout tweaks 2020-11-27 21:57:41 +01:00
zadam 31746e7baf Merge remote-tracking branch 'origin/master' 2020-11-27 20:40:40 +01:00
zadam 48b1703725 moved "global buttons" on the tree 2020-11-27 20:40:32 +01:00
baddate 72d6440de7 add chinese version README. (#1465) 2020-11-27 08:37:08 +01:00
zadam eaed7ec86f improvements in search UI 2020-11-26 23:00:27 +01:00
zadam 02043d9109 note list is now separate widget which allows more flexibility in its usage 2020-11-25 23:18:30 +01:00
zadam b9c0823abf added workspace icon and background color 2020-11-25 20:25:55 +01:00
zadam 61f30373d4 hoisting improvements 2020-11-24 23:24:05 +01:00
zadam 9889166afc Merge remote-tracking branch 'origin/stable' 2020-11-24 23:19:16 +01:00
zadam 8ae82f5b69 fix "open in new tab" in tree context menu 2020-11-24 23:18:53 +01:00
zadam 26442f418a fix "open in new window" link context menu 2020-11-24 23:06:37 +01:00
zadam 35d5036aaa hoisting fixes 2020-11-24 22:32:22 +01:00
zadam 14f5b46ece Merge remote-tracking branch 'origin/stable' 2020-11-24 20:31:16 +01:00
zadam 23a432e7d8 don't show imageLinks in link map when they are connecting parent (text note) and child (image), closes #1461 2020-11-24 20:12:49 +01:00
zadam ac636b6649 WIP per-tab hoisting 2020-11-23 23:11:21 +01:00
zadam 52b8162d01 WIP per-tab hoisting 2020-11-23 22:52:48 +01:00
zadam 167b6974fe Merge remote-tracking branch 'origin/stable' 2020-11-23 21:20:06 +01:00
zadam 984ecaf99c show again the table handle and type around 2020-11-23 20:56:14 +01:00
zadam 21b73a86b2 show also keyboard shortcut for duplicateSubtree in context menu 2020-11-23 20:17:53 +01:00
zadam 7d8277699c add keyboard shortcut for duplicate subtree, #1451 2020-11-23 19:44:49 +01:00
zadam 4bd86a6dfa WIP per-tab hoisting 2020-11-22 23:05:02 +01:00
zadam 5bbec118e4 Merge remote-tracking branch 'origin/stable' 2020-11-22 22:48:26 +01:00
zadam 928ed7a034 add keyboard shortcut for include note, closes #1410 2020-11-22 22:44:06 +01:00
zadam 473229f03a Merge remote-tracking branch 'origin/stable' 2020-11-21 20:44:37 +01:00
zadam 882b6be580 release 0.45.5 2020-11-20 22:50:10 +01:00
zadam e5fa1e0ed5 hide table's selection handle, fixes #1448 2020-11-20 21:01:44 +01:00
zadam af1fd5bd06 improvements to collapsible section container 2020-11-19 23:02:25 +01:00
zadam c737a3adc9 Merge remote-tracking branch 'origin/stable' 2020-11-19 21:42:49 +01:00
zadam 1047aecfbd template subtree is now deep-duplicated on template assignment 2020-11-19 14:29:26 +01:00
zadam 314e0a453f "duplicate note" now duplicates whole note subtree instead of just individual note 2020-11-19 14:06:32 +01:00
zadam 8ec476ba96 fix ENEX import note saving 2020-11-19 13:30:39 +01:00
zadam 8e2bf7795c Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/routes/api/attributes.js
#	src/routes/api/sender.js
2020-11-18 22:42:37 +01:00
zadam a346ba7038 removed outstandingPushes counting which is not needed 2020-11-18 22:30:00 +01:00
zadam fd6b2f1e7f enex import cleanup 2020-11-18 21:30:56 +01:00
zadam 6662b9dbf9 rate limiting to improve responsiveness during / after import 2020-11-17 23:05:05 +01:00
zadam c0a29ede05 small fixes to ENEX import 2020-11-17 22:35:20 +01:00
zadam 845907b8d2 fix recent changes to show all deleted notes (also without note revisions) 2020-11-17 21:06:38 +01:00
zadam b12008e313 more robust search in face of inconsistent cache 2020-11-17 20:44:38 +01:00
zadam a108ef91a0 fixed .createNoteLink API documentation 2020-11-17 20:11:10 +01:00
ohdearaugustin 4fd9e7f14f Drop privileges (#1422) 2020-11-15 20:51:47 +01:00
zadam b5480b4137 fix sync check - it was always reporting success even in failure cases 2020-11-15 20:50:24 +01:00
zadam 47d61c416d release 0.45.4 2020-11-12 22:15:23 +01:00
zadam 6c57b2220f fix export download, fixes #1411 2020-11-12 22:13:59 +01:00
zadam 99f01b9ccf fix overwriting / deleting auto links, closes #1406 2020-11-11 23:15:48 +01:00
zadam d5a9abd911 fix duplicating relations after change, closes #1405 2020-11-11 23:02:14 +01:00
zadam a3a2bc0a74 fix "reviving" deleted attributes, closes #1404 2020-11-11 22:44:13 +01:00
zadam 7859aca006 Merge remote-tracking branch 'origin/stable' 2020-11-11 21:28:11 +01:00
zadam 402e5c4d81 release 0.45.3 2020-11-10 22:54:40 +01:00
zadam 5157fc15e9 electron update 2020-11-10 22:54:03 +01:00
zadam 1403acd808 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/public/app/services/note_content_renderer.js
2020-11-08 21:06:48 +01:00
zadam 4bd87b1796 update ckeditor5-math which fixes focus and placeholder issues 2020-11-07 21:28:12 +01:00
zadam ce33eb3abd fix wrong behavior when customResourceProvider has empty value, fixes #1393 2020-11-06 21:52:57 +01:00
zadam f988935a33 fixed & refactored opening/downloading file notes 2020-11-05 21:26:24 +01:00
zadam 9b05d30b47 update boxicons to 2.0.7 2020-11-03 22:44:50 +01:00
Praxis | Darian e258de329c Use user theme on mobile (#1374) 2020-11-02 20:53:43 +01:00
zadam 044bcf6f05 Merge remote-tracking branch 'origin/stable' 2020-11-01 21:25:38 +01:00
zadam 9e97fdcc49 convert H1 to H2 also during import 2020-11-01 20:38:39 +01:00
zadam 2c028f7c45 new CollapsibleSectionContainer WIP 2020-10-31 22:47:15 +01:00
zadam 435200ec5a new CollapsibleSectionContainer WIP 2020-10-30 22:57:26 +01:00
zadam 3d808d638a Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/services/note_content_renderer.js
2020-10-30 15:40:57 +01:00
zadam 8e8148ce42 fix math rendering in note revisions, fixes #1359 2020-10-30 15:06:11 +01:00
zadam af41e5d115 release 0.45.2 2020-10-29 22:57:25 +01:00
zadam 4f75b6aaaf fix removing stale branches from saved search after refresh, fixes #1354 2020-10-29 22:41:33 +01:00
zadam 82f410f695 fix math rendering in included note and note tooltip, fixes #1340 2020-10-29 21:06:30 +01:00
zadam 2bc06959c3 add a warning to change password dialog, fixes #1344 2020-10-29 20:57:26 +01:00
zadam b898973ee6 fixed update ckeditor to 23.1.0 2020-10-29 20:09:25 +01:00
zadam a2b0d8a379 update ckeditor to 23.1.0 2020-10-29 20:02:38 +01:00
zadam 06a4eab7d5 improved detection of image notes in ENEX import, fixes #1348 2020-10-28 23:36:45 +01:00
zadam 25df1a054c fix triggering change event when item is chosen from autocomplete, fixes #1345 2020-10-28 21:48:34 +01:00
zadam 8c4ff7ed2a fix using smart values with .dateCreated, closes #1338 2020-10-27 22:45:22 +01:00
zadam 609829653e fix docker build 2020-10-27 19:39:54 +01:00
zadam bb0ee0b36c expand all / collapse all will re-render list instead of doing that manually 2020-10-26 22:52:12 +01:00
zadam 5f20d033a8 release 0.45.1 2020-10-26 22:51:10 +01:00
zadam b70ee742e8 Merge remote-tracking branch 'origin/math2'
# Conflicts:
#	package-lock.json
2020-10-26 21:44:18 +01:00
zadam 93d0324177 fix case where parents of templates are not loaded
(cherry picked from commit a3f4fc7762)
2020-10-26 20:13:11 +01:00
zadam 0afd3c65aa fix setting note title on back/forward button click, closes #1334 2020-10-26 20:11:43 +01:00
zadam 8901c3ec91 fix recent changes showing deleted search note, closes #1331 2020-10-26 19:58:56 +01:00
zadam c671b0a345 fix OPML import, closes #1333 2020-10-26 19:02:33 +01:00
zadam 9f424836e2 fix adding relation noteId as value, closes #1329 2020-10-26 16:05:34 +01:00
zadam 7f5af4b959 fix broken addTextToActiveEditor API method, closes #1332 2020-10-26 15:57:37 +01:00
zadam 4281111344 initial integration of note list renderer into search results 2020-10-25 23:02:12 +01:00
zadam 37e111d8a9 trim content for grid view 2020-10-25 11:00:27 +01:00
zadam 4202af96c8 image scaling improvements 2020-10-25 00:12:07 +02:00
zadam d0efd67d5e grid view improvements, remembering grid/list status 2020-10-24 23:50:32 +02:00
zadam aeb6c34d27 note list rendering WIP 2020-10-24 00:02:38 +02:00
zadam a3f4fc7762 fix case where parents of templates are not loaded 2020-10-24 00:02:10 +02:00
zadam 6517188b39 fix tree loading (partial revert of previous commit) 2020-10-24 00:00:24 +02:00
zadam c4acecd510 fix loading unnecessary notes into the cache 2020-10-23 23:19:29 +02:00
zadam c7d8bddf24 conversion of note list renderer to class 2020-10-23 22:11:39 +02:00
zadam 29c1d05540 frontend dayjs update 2020-10-23 21:24:16 +02:00
zadam 55f04436c0 saving expanded status as label 2020-10-23 00:11:44 +02:00
zadam 4ce2eaa919 note list paging 2020-10-22 23:50:52 +02:00
zadam 489e064932 expand/collapse all 2020-10-22 23:07:35 +02:00
zadam 1369603ed9 note list renderer WIP 2020-10-22 22:49:22 +02:00
zadam 79431d8b4b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	package-lock.json
#	package.json
#	src/routes/api/sender.js
2020-10-21 23:23:55 +02:00
zadam 4591899df0 Merge branch 'math2'
# Conflicts:
#	package-lock.json
#	package.json
2020-10-21 23:23:19 +02:00
zadam dc64d333b6 release 0.45.0-beta 2020-10-21 22:57:54 +02:00
zadam 283808d691 library updates 2020-10-21 22:57:47 +02:00
zadam a4bf69fe6a Merge remote-tracking branch 'origin/stable' into math2 2020-10-21 22:46:00 +02:00
zadam 6c7853319c reload note paths on note rename 2020-10-21 22:45:49 +02:00
zadam 2b1aa0d386 fix build revision link 2020-10-21 22:41:32 +02:00
zadam dfa7d3f186 Update README.md 2020-10-21 22:40:34 +02:00
zadam 24ae24a1ac release 0.44.9 2020-10-20 22:43:25 +02:00
zadam 00d860bfae properly handle saved search virtual branches during reloads, fixes #1301 2020-10-20 22:33:38 +02:00
zadam a9f49e7f25 Merge remote-tracking branch 'origin/stable' into math2 2020-10-20 20:31:27 +02:00
zadam fcf80f1e57 fix 2020-10-19 23:58:13 +02:00
zadam dc94e1a1bf added list style, closes #1311 2020-10-19 23:54:37 +02:00
zadam 313b9dba61 support math in read only text notes 2020-10-19 23:36:57 +02:00
zadam 32e3560dce Merge remote-tracking branch 'origin/stable' into math2 2020-10-19 23:04:12 +02:00
zadam 7bd7323097 limit max width of zen mode to improve readability, closes #1320 2020-10-19 22:25:35 +02:00
zadam 0cb46f8f9b don't strip evernote links during import, #1319 2020-10-19 22:14:29 +02:00
zadam c2b64bad80 hoisting bugfixes 2020-10-19 22:10:25 +02:00
zadam 991b335c3e allow exporting code notes from note actions, closes #1315 2020-10-19 20:29:56 +02:00
zadam fd2d49de4f fix display of checkboxes in promoted attributes, closes #1313 2020-10-19 20:22:30 +02:00
zadam b990239219 allow sender to save labels 2020-10-16 19:43:20 +02:00
Casey Doran a7c13ceacc if the sender request contains a label and/or a labelValue, apply it (#1310) 2020-10-16 19:40:30 +02:00
zadam f23454ffa3 math support WIP 2020-10-15 23:57:29 +02:00
zadam 631a11509a experimental math support 2020-10-15 20:49:42 +02:00
zadam b2b3c80192 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	package-lock.json
#	package.json
2020-10-15 20:47:10 +02:00
zadam bf9bfe920a use icons instead of text links for header actions 2020-10-15 20:37:55 +02:00
zadam ad878c078e release 0.44.8 2020-10-15 00:01:13 +02:00
zadam 8a019d617f small visual tweaks to link map, including displaying the note icon 2020-10-14 23:14:04 +02:00
zadam 4a76b7a9a5 use correct path separator, closes #1308 2020-10-14 20:42:55 +02:00
zadam 1ac1bf12a2 upgrading webpack fixes the issue with broken mobile frontend (and hacky fix which breaks desktop in turn) 2020-10-14 14:20:06 +02:00
zadam b50638e85c release 0.44.7 2020-10-13 23:45:39 +02:00
zadam 893b6053d2 provide also explicit unhoist keyboard shortcut, #1305 2020-10-13 23:41:55 +02:00
zadam a1ec6fe0aa fix file preview in note revisions dialog 2020-10-13 23:09:57 +02:00
zadam 18cc9f2475 "open" action will save note to temp directory to try it then open with native application, #1304 2020-10-13 22:50:45 +02:00
zadam 04ea8dd4b3 fix scroll to top for read only / editable text note after switching note 2020-10-13 22:03:16 +02:00
zadam 28cb3976e5 add explicit button to show/hide right pane widgets, #1299 2020-10-12 23:15:53 +02:00
zadam a665d193eb same event handling note execute only once, closes #1278 2020-10-12 22:30:30 +02:00
zadam cabb78b3e4 double click on an external link opens it 2020-10-12 22:11:49 +02:00
zadam d953d96fa6 improvements to error logging in frontend 2020-10-12 21:05:34 +02:00
zadam c71ac0302a use var instead of const to avoid webpack issue in mobile frontend build, closes #1300 2020-10-10 23:45:38 +02:00
zadam 4eb9ca7b46 fix demo document word count widget with contain: none 2020-10-10 21:08:28 +02:00
zadam 42daf181d3 round zoom factor 2020-10-10 20:12:39 +02:00
zadam badb678b69 note list renderer improvements, still WIP 2020-10-08 23:46:48 +02:00
zadam 140f0a5dbd return null for not found attribute, closes #1294 2020-10-08 22:08:58 +02:00
zadam 5933b17b47 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	libraries/ckeditor/ckeditor.js.map
2020-10-07 23:29:10 +02:00
zadam 761912c3bd basic separation of note list renderer from book type 2020-10-07 23:08:17 +02:00
zadam 10ce26799d release 0.44.6 2020-10-07 00:07:23 +02:00
zadam 91a2bb9b26 fixed demo document - restored more up to date version + largest notes stats 2020-10-06 22:25:28 +02:00
zadam 287ef9b522 added base element to handle external links in exports, #1289 2020-10-06 21:30:41 +02:00
zadam 99f35b2588 Merge remote-tracking branch 'origin/stable' 2020-10-06 21:03:28 +02:00
zadam 32d609e796 fix largest notes script, #1291 2020-10-06 20:58:14 +02:00
zadam 8a435a2149 don't save zero byte buffers as note revisions 2020-10-05 23:56:59 +02:00
zadam 8855f29a49 detect TAB in table - then don't indent/outdent but switch table cells, closes #1290 2020-10-05 22:51:28 +02:00
zadam 384a9474c0 added meta viewport to exported HTMLs, #1289 2020-10-05 22:23:03 +02:00
zadam a7f510783d reduce top margin of first paragraph in text, closes #1286 2020-10-05 21:31:57 +02:00
zadam 1a262fe680 attribute autocomplete should show prefix matches first and only after matches anywhere, #1284 2020-10-03 22:00:34 +02:00
zadam 0c4deda091 don't insert space after mentined label/relation, #1284 2020-10-03 21:51:10 +02:00
zadam 71894c34aa fix migration so that only really changed notes are updated, #1254 2020-10-03 20:51:14 +02:00
zadam 8313116b7f disable CSP completely, fixes #1282 (and other similar issues) 2020-10-02 23:33:28 +02:00
zadam 90622d71f8 caching parsed keyboard actions 2020-10-02 22:29:16 +02:00
zadam 620e896a89 faster content hash computation via in memory sorting 2020-10-02 21:53:25 +02:00
zadam a9a9edf658 clear any event listener added in previous invocation of this function 2020-10-02 21:44:21 +02:00
FliegendeWurst 5e2077e6ae Jump to note dialog: fix duplicate event triggers (#1283)
This fixes an issue where the current path (above the note tree) displays parts multiple times, e.g. A / A / B / B instead of A / B.

The same issue could also affect other event handlers, but I didn't look around the codebase further.

(cherry picked from commit 51eb9f18f7)
2020-10-02 21:12:40 +02:00
FliegendeWurst 51eb9f18f7 Jump to note dialog: fix duplicate event triggers (#1283)
This fixes an issue where the current path (above the note tree) displays parts multiple times, e.g. A / A / B / B instead of A / B.

The same issue could also affect other event handlers, but I didn't look around the codebase further.
2020-10-02 21:12:13 +02:00
zadam a0e4a416cd release 0.44.5 2020-10-01 23:45:09 +02:00
zadam 8f018cc7c6 as part of tree/note load make sure also relation targets are loaded, closes #1273 2020-10-01 23:42:09 +02:00
zadam 4a470ff9e5 right click on electron in editor will show both context menu and balloon toolbar, make z-index of context menu higher, #1281 2020-10-01 22:57:07 +02:00
zadam 4b8ca31091 Merge remote-tracking branch 'origin/stable' 2020-09-30 22:50:33 +02:00
zadam 03e4c49f89 updated API docs 2020-09-30 22:48:52 +02:00
zadam 4f92fbf8a5 updated API docs 2020-09-30 22:48:30 +02:00
zadam dd020baee5 fix backend API's createNote(), closes #1275 2020-09-30 22:45:15 +02:00
zadam cba9b92202 make sure the attribute is not duplicated in TreeCache and NoteCache, #1278 2020-09-30 22:34:18 +02:00
zadam d163289003 fixed messed up highlighting when searching e.g. "a" 2020-09-27 23:11:56 +02:00
zadam c45f590e9f put edit link balloon below z-index of dialogs, closes #1272 2020-09-27 23:03:05 +02:00
zadam fbb36d652f external links are not opened on click 2020-09-27 23:02:21 +02:00
zadam 2706f1b02f Merge remote-tracking branch 'origin/stable' 2020-09-26 23:28:50 +02:00
zadam 8f68b4f298 make migration more robust, fixes #1271 2020-09-26 23:25:35 +02:00
zadam 6710476768 new saved search UI wip 2020-09-25 23:52:24 +02:00
zadam de30095737 change salts on password change + more robust handling of decryption failures 2020-09-25 20:55:45 +02:00
zadam 9de51c8b9e release 0.44.4 2020-09-24 23:33:36 +02:00
zadam 748979eafd fix note.text #1263 2020-09-24 23:13:27 +02:00
zadam 8ad7318bd8 use correct search expression for "search in subtree", #1263 2020-09-24 22:42:32 +02:00
zadam e2fcc6711a style tweak of sidebar headers 2020-09-24 21:58:00 +02:00
zadam 5f6dd18489 added migration to fix notePosition to always step in 10 increments 2020-09-23 23:08:58 +02:00
zadam a577485e42 allow duplicating multiple notes at once, closes #1259 2020-09-23 22:45:51 +02:00
zadam 1fcb99fa60 fix duplication of search results when conforming to multiple expressions in OR relation, closes #1262 2020-09-23 22:27:19 +02:00
zadam bdebb35f62 better error reporting on failed search 2020-09-23 22:18:26 +02:00
zadam 2b1383205b test fixes 2020-09-23 21:05:26 +02:00
zadam 995f4f2582 similarity takes into account also headings in the base note plus additional fixes 2020-09-22 23:10:01 +02:00
zadam 15796b6870 fix attr detail positioning 2020-09-21 23:27:22 +02:00
zadam 12943ca151 fix removing attrs from UI 2020-09-21 23:08:39 +02:00
zadam 0e795b2978 create note inline, #1237 2020-09-21 22:08:54 +02:00
zadam 0eef18a799 create note inline 2020-09-21 00:07:46 +02:00
zadam 6518d113c6 fix highlighting in some mime types 2020-09-20 23:33:11 +02:00
zadam ea524403f7 fix position of Edit button in read only code 2020-09-20 22:19:32 +02:00
zadam 1d5a53fee6 load simple mode by default, fixes #1256 2020-09-20 21:42:51 +02:00
zadam 395eb92d93 cleanup of unnecessary codemirror mode files 2020-09-20 21:42:15 +02:00
zadam 71323500b7 updated codemirror to 5.57.0 2020-09-20 21:41:40 +02:00
zadam 7f9bcc162e release 0.44.3-beta 2020-09-19 23:45:46 +02:00
zadam 27052143ab fix placement of "Edit" button on read only notes 2020-09-19 23:44:30 +02:00
zadam 50d3ddbed5 added remove formatting plugin, closes #1239 2020-09-19 23:43:50 +02:00
zadam 7ee50113d7 fix export root note 2020-09-19 22:47:14 +02:00
zadam 07bd5129ca similarity tweaks 2020-09-19 21:59:01 +02:00
zadam ec7021b436 added debugModeEnabled option 2020-09-18 23:22:28 +02:00
zadam c75439a4b5 similarity tweaks 2020-09-18 21:47:59 +02:00
zadam d21cb78baa fix wrong dateLastEdited timestamp, closes #1254 2020-09-18 21:47:15 +02:00
zadam c371873b7e support unicode in button names, closes #1250 2020-09-17 14:41:00 +02:00
zadam 6220b02ef0 similarity tweaks 2020-09-17 14:34:10 +02:00
zadam 4e15bc0bb1 similarity tweaks 2020-09-17 09:33:43 +02:00
zadam 2f720df9d2 migration to convert H1 to H2, #1240 2020-09-16 20:51:57 +02:00
zadam d57a303251 fix in ENEX import 2020-09-16 20:32:20 +02:00
zadam 13b9f5231c similar note tweaks 2020-09-16 17:34:48 +02:00
zadam 71ed24344c performance optimizations in similar notes 2020-09-16 14:23:59 +02:00
zadam 0c8a2a23a7 refactor similarity logic 2020-09-16 11:50:47 +02:00
zadam 5738f2a5b3 similar notes tweaks 2020-09-16 11:24:29 +02:00
zadam d345c4850f custom implementation of similar notes algorithm 2020-09-15 22:46:51 +02:00
zadam eeacd8118f similar notes changes 2020-09-15 16:46:03 +02:00
zadam f5216e4799 close note type dropdown after click 2020-09-15 00:13:25 +02:00
zadam 85d13b1d62 resort relationships in tree cache after note reordering 2020-09-14 22:48:20 +02:00
zadam f5f48ef6c4 copy child: attrs also when defined on a template/parent note 2020-09-14 21:08:11 +02:00
zadam f1ed114167 small blink on attr save as a visual hint 2020-09-14 21:07:00 +02:00
zadam 70995a7691 fix broken saved search, closes #1234 2020-09-14 20:00:36 +02:00
zadam a82b8cdb37 release 0.44.2-beta 2020-09-13 23:03:28 +02:00
zadam 33511c0c10 fix hiding similar notes widget by label 2020-09-13 22:47:23 +02:00
zadam 04c93d6736 fix attr detail related notes 2020-09-13 22:23:03 +02:00
zadam 5e11806110 sidebar widgets can be now disabled with labels 2020-09-13 21:59:31 +02:00
zadam 1e1709ca6a mobile layout fixes + fix mobile delete note 2020-09-13 21:12:22 +02:00
zadam 37602cfcae small tweaks 2020-09-13 00:19:50 +02:00
zadam 0ca0996751 no difference in styling when active tree node is in focus or not because focused class is unreliable 2020-09-12 23:06:03 +02:00
zadam 63ebb46049 fix inverse relation detection in relation maps 2020-09-12 22:21:44 +02:00
zadam 847766b434 fancytree 2.37.0 2020-09-12 21:25:47 +02:00
zadam 056c40c0d0 similar notes algorithm tweaks (WIP) 2020-09-10 21:01:46 +02:00
zadam bff5b015ea wrap note autocomplete for very long note path titles, closes #1221 2020-09-09 20:49:44 +02:00
zadam ee4ce3ffd8 display unhoist button on the left of the note title so that it's always visible, #1223 2020-09-08 23:25:21 +02:00
zadam a73733d0fc renamed ParsingContext to SearchContext 2020-09-08 21:47:37 +02:00
zadam 0c5f842626 improvements to note tooltip - include (some) notePath and attributes 2020-09-08 21:45:07 +02:00
zadam 8b4cf474bd cleanup/fixes of label/relation definition usages in the old style 2020-09-08 20:42:50 +02:00
zadam 80f269d844 moved similar notes from sidebar to the center pane 2020-09-07 23:35:41 +02:00
zadam 75c9db6432 fixed search API and its default settings to include archived notes 2020-09-07 22:11:16 +02:00
zadam 69e36d2677 refactoring for archived notes handling in note cache 2020-09-07 00:05:01 +02:00
zadam eb4d86f41d changed presentation of similar notes to "tag cloud" style 2020-09-06 22:48:52 +02:00
zadam b0bf88c487 fix storing dateLastEdited timestamp in note revisions 2020-09-06 22:04:11 +02:00
zadam 032ffa8367 fix printing port to console #1219 2020-09-06 20:58:26 +02:00
zadam 7400c91a4f missing space in inherited attribute list, fixes #1217 2020-09-06 20:53:59 +02:00
zadam fbdf089d5d release 0.44.1-beta 2020-09-05 23:43:06 +02:00
zadam a7505682ed more compact note revisions widget 2020-09-05 23:35:24 +02:00
zadam b148f3d032 more compact note info widget 2020-09-05 22:49:30 +02:00
zadam 874972a3d3 fix broken what links here widget 2020-09-05 22:45:26 +02:00
zadam 6d095b7250 fix popups/tooltips not disappearing after loading new note, closes #1214 2020-09-05 21:51:00 +02:00
zadam ceb762e56b fix zen mode with attributes, closes #1213 2020-09-04 23:35:10 +02:00
zadam 0c72d29684 fix zen mode with attributes, closes #1213 2020-09-04 22:54:50 +02:00
zadam 29efe3a492 fix showing a search box, closes #1212 2020-09-04 21:10:54 +02:00
zadam 5bdfb6e11f release 0.44.0-beta 2020-09-03 23:26:51 +02:00
zadam 11c63b7778 remove test as build step 2020-09-03 23:26:36 +02:00
zadam befec48506 release 0.44.0-bet 2020-09-03 23:25:23 +02:00
zadam 15d94e91db fix note autocomplete for non-recent notes 2020-09-03 22:37:51 +02:00
zadam 7787fa1758 small promoted attrs style tweaks 2020-09-03 22:22:21 +02:00
zadam 0bd9b849b2 fix problems with updating note in note cache when entities are coming out of order (e.g. sync) 2020-09-03 21:37:06 +02:00
zadam 918e827d91 fix potential null in mime or type in note cache 2020-09-03 17:51:37 +02:00
zadam 42ecc0e15b use just note title in note autocomplete input field 2020-09-03 17:38:11 +02:00
zadam a37fa0cb3f don't use &nbsp; for attributes since it (duh) prevents line breaking in case of inherited attributes 2020-09-02 23:16:56 +02:00
zadam 647863b489 escape will close the attribute dialog and cancel changes 2020-09-02 16:40:19 +02:00
zadam e8114fcc4f fixes in attr detail positioning 2020-09-02 16:06:35 +02:00
zadam 0745d9ec0b fix attr help tooltip appearing only the second time 2020-09-01 23:47:56 +02:00
zadam 5e75d2380a fix error after confirming mention relation name 2020-09-01 23:43:09 +02:00
zadam 32c88c7481 keyboard shortcuts for focusing the attributes, adding a new label and relation 2020-09-01 23:18:28 +02:00
zadam 0aef99b98e attr detail automatically focuses the name input and allows saving with ctrl+enter. 2020-09-01 22:47:36 +02:00
zadam bf548f9d38 fix Jump To search input restoration 2020-09-01 00:05:19 +02:00
zadam a15f8d7e11 small fixes 2020-08-31 23:13:39 +02:00
zadam 574b71de63 remember last search in Jump To dialog when searching soon after the previous search 2020-08-31 21:00:23 +02:00
zadam 408ed8dbf0 fix "search in fulltext" button on "jump to note" dialog. 2020-08-31 20:46:55 +02:00
zadam 98f1bc51a5 Merge remote-tracking branch 'origin/stable' 2020-08-30 23:53:24 +02:00
zadam f3efb22a50 extra search tests 2020-08-30 23:42:24 +02:00
zadam 5fd58def11 small refactorings 2020-08-30 23:19:55 +02:00
zadam b793f8cb88 search will also look for type and mime by default 2020-08-30 23:12:49 +02:00
zadam 058edcfe15 fixed promoted attribute display 2020-08-30 22:39:15 +02:00
zadam 5d500de527 performance monitoring on frontend in dev environment 2020-08-30 22:29:38 +02:00
zadam 81207f3d27 updated demo document with scripts adjusted to syncified DB access 2020-08-29 23:33:15 +02:00
zadam 21575d862b attempt to fix consistency issue bug which caused synced note_contents to have NULL content when original is empty string 2020-08-29 23:08:53 +02:00
zadam 9359f05335 fix "edited notes on a day" for deleted notes 2020-08-29 22:22:24 +02:00
zadam 7fb22d41a0 allow disabling authentication for server version, closes #1132 2020-08-29 00:11:50 +02:00
zadam 2823bf3488 disable toggling navigation buttons because of rare performance issues 2020-08-28 23:49:24 +02:00
zadam 172f3689fa optimization of search 2020-08-28 23:20:22 +02:00
zadam 5a8c3f6a2b removed forgotten console.logs 2020-08-28 22:52:57 +02:00
zadam 416b7088c5 fix update/delete queries in SQL console 2020-08-28 22:04:35 +02:00
zadam 3f69a3c572 fix parsing attributes with non-breakable space 2020-08-28 16:00:30 +02:00
zadam 268910ed3b fix positioning of attr detail popup for smaller windows 2020-08-28 15:38:04 +02:00
zadam 8259b4a32c close down dropdown menus on click + smaller tweaks 2020-08-28 14:52:38 +02:00
zadam 9873dd1242 fix creating new note 2020-08-28 14:29:20 +02:00
zadam f4266754d8 release 0.43.4 2020-08-27 23:58:58 +02:00
zadam 30e84321f9 fixes to build 2020-08-27 23:54:02 +02:00
zadam 020a8766c8 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/public/app/widgets/note_tree.js
2020-08-27 23:25:10 +02:00
zadam dc288fb18c Merge remote-tracking branch 'origin/stable' into stable 2020-08-27 23:22:58 +02:00
zadam 26dfa1ffdb activate PDF preview also in server build, fixes #1208 2020-08-27 23:22:36 +02:00
zadam d4e1900f89 cleanup of useless files when building release artifacts 2020-08-27 23:04:00 +02:00
zadam 4cd1a0ee7d fix note cache for out of order synced entities 2020-08-27 22:37:57 +02:00
zadam 355780c595 sync fixes 2020-08-27 22:11:17 +02:00
zadam ef996f3919 bug fixes 2020-08-27 22:03:56 +02:00
zadam 445902d081 ckeditor 22 2020-08-27 15:24:23 +02:00
zadam 31d85ed8cc fixes and tweaks - readonly bar is smaller and on the right 2020-08-27 14:54:56 +02:00
zadam c8af250caa Merge remote-tracking branch 'origin/master' 2020-08-27 12:47:29 +02:00
zadam b7b13c1d8b make migration more robust for cases where attribute definitions don't contain valid values, closes #1207 2020-08-27 12:44:49 +02:00
zadam b05b9196a0 fix build with better-sqlite3 binaries 2020-08-26 23:51:30 +02:00
zadam fbe3995398 fixed tree hotkeys 2020-08-26 22:12:01 +02:00
zadam 6aa61ca306 initializing note tree synchronously 2020-08-26 16:50:16 +02:00
zadam 87161cfe0d fix issues with note tree 2020-08-25 23:25:15 +02:00
zadam 6a3e27eb62 smaller refactorings in note_tree 2020-08-24 23:33:27 +02:00
zadam b7947a40ea binaries for better-sqlite3, downgrage to electron 9 since build on windows doesn't for 2020-08-24 20:26:52 +02:00
zadam 1d813c82e4 display attribute help on the attr detail during editing 2020-08-23 23:38:05 +02:00
zadam 46e373e822 "smart" date values can now freely contain whitespaces 2020-08-23 21:53:50 +02:00
zadam a6c79c934c fix global menu button and extra window 2020-08-22 23:07:52 +02:00
zadam 08c612c876 fixed builds for linux desktop 2020-08-22 23:07:31 +02:00
zadam ed6181a85e added in-editor help for editing attributes 2020-08-21 23:08:53 +02:00
zadam 0533b95562 Merge remote-tracking branch 'origin/master' 2020-08-20 23:15:45 +02:00
zadam 5b4826fd08 extra tests for escaping 2020-08-20 23:15:38 +02:00
zadam 60e213433b Merge remote-tracking branch 'origin/stable' 2020-08-20 15:45:57 +02:00
zadam 153de63f4d update note title in link map when note is renamed 2020-08-20 15:45:33 +02:00
zadam 4d4d9f2000 small fixes to saved search 2020-08-20 15:28:28 +02:00
zadam 0b38e24185 fixes to saved search 2020-08-20 15:23:24 +02:00
zadam d037420acb note. prefix also separates fulltext tokens from expression tokens 2020-08-20 13:53:15 +02:00
zadam 20b4b059e3 fix jsdoc 2020-08-20 12:00:57 +02:00
zadam 28ebca1268 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	package-lock.json
#	package.json
#	src/services/image.js
2020-08-20 11:56:03 +02:00
zadam a89629b3de add fallback when resizing image fails, closes #1190 2020-08-20 11:34:14 +02:00
zadam eec850c11f fix toggle sidebar issues, closes #1196 2020-08-20 11:14:27 +02:00
zadam 52e0f838a9 fulltext now ignores archived notes like it used to in the old implementation 2020-08-20 00:15:08 +02:00
zadam d1f70efdb4 Merge remote-tracking branch 'origin/master' 2020-08-19 23:01:00 +02:00
zadam 5b1e229d7d added note.text + tests 2020-08-19 23:00:51 +02:00
zadam 5c55278c59 attr detail small visual tweaks 2020-08-19 18:05:07 +02:00
zadam 3c224e80ee fix opening links in attr detail 2020-08-19 17:59:55 +02:00
zadam 5741b380f0 fixed script support 2020-08-18 23:32:50 +02:00
zadam 7335844ae3 updated DB schmea 2020-08-18 22:37:23 +02:00
zadam 53c361945b fix setting mime after import + cleanup of old search code 2020-08-18 22:20:47 +02:00
zadam 03d7ee9abb compatibility with existing scripts 2020-08-18 21:32:45 +02:00
zadam 3670fbff49 frontend validation of attribute name + other changes and fixes 2020-08-17 23:54:18 +02:00
zadam f24e27dadd autocollapse notes after period of inactivity + some other changes, #1192 2020-08-17 20:58:34 +02:00
zadam 53b39e2e82 many changes related to #1192:
- use CSS contain wherever possible to reduce subtrees of forced reflows
- reduced dependency between note and note_contents updates which will reduce number of updates to components
- optimization of "many rows" querying
2020-08-16 22:57:48 +02:00
zadam c20577909c simplified and more consistent link handling, also fixes #1191 2020-08-15 22:30:40 +02:00
zadam a87b710626 attribute fixes 2020-08-15 21:24:17 +02:00
zadam 625483a8f2 fixes 2020-08-15 00:06:26 +02:00
zadam 121c819b79 fix sizing of toast since bootstrap 4.5.1 2020-08-14 23:53:37 +02:00
zadam 77a3bdce1f related notes get updated as user types in the attr detail dialog 2020-08-14 23:00:15 +02:00
zadam 827f8b42a0 Merge remote-tracking branch 'origin/stable' 2020-08-14 22:34:17 +02:00
zadam b815e10ff3 add running tests into the build process 2020-08-14 22:30:01 +02:00
zadam c2789bf355 use relative paths for fonts in steel blue in demo document, closes #1187 2020-08-14 21:04:18 +02:00
zadam e8d63b5647 add "search in note" to "note actions" menu, #1184 2020-08-14 20:58:19 +02:00
zadam 53c6542af6 Merge remote-tracking branch 'origin/master' 2020-08-14 00:11:35 +02:00
zadam d9c246f8a7 fixes for promoted attribute multiplicity 2020-08-14 00:11:26 +02:00
dependabot[bot] 803694d113 Bump lodash from 4.17.15 to 4.17.20 (#1189)
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.20.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.20)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-13 23:29:27 +02:00
zadam f6f9f0d2c0 ability to remove attribute with mouse + other tweaks 2020-08-13 23:23:57 +02:00
zadam 47a9516ada Merge remote-tracking branch 'origin/stable' 2020-08-13 00:00:05 +02:00
zadam bd8b83898f Merge remote-tracking branch 'origin/stable' into stable 2020-08-12 23:59:42 +02:00
zadam 97109efb6c fix attribute cache invalidation 2020-08-12 23:59:33 +02:00
zadam b4d9fdaeda fix attribute cache invalidation 2020-08-12 23:58:32 +02:00
zadam 1810116a34 attribute fixes 2020-08-12 23:39:05 +02:00
Jody 3e89855aa3 Add web app manifest (#1174)
* Add web app manifest, link to new manifest on mobile template.

* Remove duplicate manifest entry.
2020-08-12 21:39:12 +02:00
zadam eaac65142f tweaks in attr list sizing 2020-08-12 21:36:43 +02:00
zadam ae909d1079 fix saving & refreshing attributes across compoments 2020-08-12 00:02:19 +02:00
zadam 935e5de493 small fixes related to inherited attributes 2020-08-11 22:52:17 +02:00
zadam 8d0df6ddb9 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	db/demo.zip
#	src/services/notes.js
#	src/services/request.js
2020-08-10 23:45:17 +02:00
zadam 3b148eb6f8 fixed demo document to correctly show included notes 2020-08-10 23:42:06 +02:00
zadam 4e8d1dac67 fixes for rendering PDF previews e.g. in include note 2020-08-10 23:39:17 +02:00
zadam 7779fd1dfe synchronize the removal of the selection in cuttonote to make it more predictable 2020-08-10 22:42:57 +02:00
zadam 960d7dede3 add scrolling margins, #1181 2020-08-09 23:20:57 +02:00
zadam e663d7da1b updated schema for entity_changes table 2020-08-09 22:44:53 +02:00
zadam 02cc52af66 small improvements and fixes 2020-08-06 23:55:17 +02:00
zadam f60af1f05e small improvements and fixes 2020-08-06 00:06:42 +02:00
zadam 224fbdc8cd small improvements to text preview in file notes 2020-08-04 22:06:25 +02:00
zadam 8561201abc invalidate note complement cache quickly after load 2020-08-04 21:57:08 +02:00
zadam 3c1a809276 external links should open only in new window, not in the original window, closes #1171 2020-08-04 20:42:32 +02:00
zadam ddf0a89e1f bootstrap 4.5.1 2020-08-04 20:39:16 +02:00
zadam 4b101baf00 CKEditor 21 content styles 2020-08-03 23:36:33 +02:00
zadam 782127dd91 fix noproxy handling for image downloading 2020-08-03 23:33:44 +02:00
zadam 7900622f38 refactored "sync" table to "entity_changes" - more changes 2020-08-02 23:43:39 +02:00
zadam 864271d5ef refactored "sync" table to "entity_changes" 2020-08-02 23:27:48 +02:00
zadam 5a5ea4f474 fix filling sync table after demo document import 2020-08-02 22:53:57 +02:00
zadam 749791f6d1 fixed CSP after upgrade to helmet 4 2020-08-02 22:26:02 +02:00
zadam 5ca3e9a0bc fixed db migrations after merge from stable 2020-08-02 20:44:46 +02:00
zadam f4a4e746bf Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	libraries/ckeditor/ckeditor.js.map
#	package.json
#	src/routes/api/login.js
#	src/routes/api/sync.js
#	src/routes/index.js
#	src/services/app_info.js
#	src/services/sync.js
2020-08-02 20:41:22 +02:00
zadam 4fc8bace94 support horizontal line, closes #1164 2020-08-01 23:41:30 +02:00
zadam 47a22f6e8d release 0.43.3 2020-07-31 23:34:05 +02:00
zadam 17d7ff3ff1 small improvements to sync table handling 2020-07-31 00:08:01 +02:00
zadam 3582013a33 import of initial demo document sets sync.isSynced incorrectly to always 0, #1163 2020-07-31 00:07:38 +02:00
zadam 95bbdb3b6b CKEditor 21 2020-07-29 23:34:49 +02:00
zadam e1dd933ec0 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/services/options_init.js
2020-07-28 23:50:54 +02:00
zadam 8a57960c6e tweaks in sync timeout handling 2020-07-28 23:29:12 +02:00
zadam a7b62b30cb fix image resizing after save/update/import 2020-07-28 00:26:47 +02:00
zadam c9cbc2db02 import fixes 2020-07-27 23:40:14 +02:00
zadam c92526372c Merge remote-tracking branch 'origin/stable' 2020-07-26 23:47:31 +02:00
zadam 5f4a84d967 fix extracting base64 inline images from HTML, fixes #1159 2020-07-26 23:47:06 +02:00
zadam ef59810f89 Merge remote-tracking branch 'origin/stable' 2020-07-26 22:58:54 +02:00
zadam 099e90ed64 fix extracting base64 inline images from HTML, fixes #1159 2020-07-26 22:58:22 +02:00
zadam 9b15437ff6 attr detail sizing 2020-07-26 00:09:53 +02:00
zadam a3a2f1a2b4 autocompletes for attribute detail 2020-07-26 00:04:34 +02:00
zadam 3261fea67f added promotedAttributesExpanded option 2020-07-25 23:32:46 +02:00
zadam b19589033d individual panes of attribute list are now opened correctly 2020-07-25 23:24:48 +02:00
zadam 2217c5a3e0 promoted attributes are now part of attr list and also responsive 2020-07-25 00:06:49 +02:00
zadam b60efbbf5a Merge remote-tracking branch 'origin/master' 2020-07-24 23:14:38 +02:00
zadam e9bfe4521e bug fixes 2020-07-24 23:14:31 +02:00
MeIchthys 79d9d79055 Minor gramatical changes (#1162)
* Minor gramatical change

change "delete also" to "also delete"

* Minor gramatical change

change "once more" to "confirmation"

* Minor gramatical changes

add "a" before some nouns.

* Minor gramatical/spelling fixes

* Minor gramatical changes

* Convert to singular action descriptions

change "changes" to "change" 
change "switches" to "switch"
change "copies" to "copy" 
etc.

* Minor gramatical changes
2020-07-24 22:03:39 +02:00
zadam a36022d8c1 fixes 2020-07-24 00:02:15 +02:00
zadam 0eb77e43e2 full text search uses in-memory search even for unprotected notes and preprocesses content with tag stripping 2020-07-23 23:38:38 +02:00
zadam e1d4be814f toggle to expand/collapse attr list is saved and propagated across tabs 2020-07-23 22:31:06 +02:00
zadam aa4a645670 adding a button to the detail to explicitly save changes. 2020-07-23 00:19:50 +02:00
zadam 2c9565b4b3 fixes to update from detail to editor 2020-07-22 23:58:01 +02:00
zadam c5cc6b91c1 label and relation definition are now displayed without prefixes in the attr detail view 2020-07-22 23:42:58 +02:00
zadam 3109233d4f better reporting for search parsing errors 2020-07-22 22:52:15 +02:00
zadam 60e8bd98b9 improvements to lexer and its tests 2020-07-21 23:42:59 +02:00
zadam 32ecb43b5c search refactoring 2020-07-21 00:01:07 +02:00
zadam f03e4bc7d7 detect attempts to compare between labels (only with constants is possible) 2020-07-20 23:27:30 +02:00
zadam 4e5ddaf7d1 fix inQuotes + tests 2020-07-19 23:23:48 +02:00
zadam 35469f6f2d lexer now marks "in quotes" tokens 2020-07-19 23:19:45 +02:00
zadam 4c7b1d6543 shortcut negation syntax 2020-07-19 15:25:24 +02:00
zadam df69b1d8dd attr detail handles label/relation definition updates 2020-07-18 23:45:28 +02:00
zadam 9d46c7253b fixes in saving 2020-07-18 00:20:24 +02:00
zadam a94ae81c30 split out attribute_editor widget, WIP 2020-07-17 23:55:59 +02:00
zadam 9f527f0330 split out attribute_editor widget, WIP 2020-07-17 00:08:28 +02:00
zadam 68d8b1c8a9 rename note_attributes widget to attribute_list 2020-07-16 23:12:10 +02:00
zadam 0ab9d02434 fancytree 2.36.0 2020-07-15 22:40:58 +02:00
zadam 3d324b954d fix checking affected notes when modified attribute's owning note is not loaded into cache, #803 2020-07-15 22:36:27 +02:00
zadam f028b88cce Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	package.json
#	src/routes/api/clipper.js
2020-07-15 00:11:26 +02:00
zadam 64dc522b27 infrastructure for editing attribute definitions 2020-07-15 00:09:37 +02:00
zadam 3d02f82c77 add label/relation from menu 2020-07-14 23:29:37 +02:00
zadam 528418aecb parsing and setting isInheritable flag 2020-07-13 23:27:23 +02:00
zadam 5dd73562da add new attr wip 2020-07-13 00:27:21 +02:00
zadam 62cacf85ed setting the relation target note 2020-07-13 00:15:00 +02:00
zadam 443f389d73 release 0.43.2 2020-07-11 23:58:59 +02:00
zadam 08edc521e4 fix visibility of hyper-link in repeatedly opened dialog 2020-07-11 23:50:38 +02:00
zadam f54f6d09b0 fix declaring global variables on the setup page, closes #1071 2020-07-11 23:19:24 +02:00
zadam 3219441fdf fallback for missing parsed title, closes trilium-web-clipper/issues/16 2020-07-11 23:05:28 +02:00
zadam 1c97310e92 correctly parsing the click position 2020-07-10 22:39:16 +02:00
zadam 0ecb2f3662 WIP 2020-07-09 23:59:27 +02:00
zadam 055db32510 removed tar import 2020-07-09 21:46:33 +02:00
zadam 054420225f added experimental "save" button 2020-07-09 00:07:14 +02:00
zadam 448a3254a3 small tweaks 2020-07-08 23:51:47 +02:00
zadam b2c0eaeaf8 Merge remote-tracking branch 'origin/stable' 2020-07-08 23:14:26 +02:00
zadam 1b0a2b41da added tab and shift-tab shortcuts for indent/outdent, closes #978 2020-07-08 21:57:09 +02:00
zadam 50b976990c click on inherited attr will also bring up the attribute detail widget 2020-07-05 23:53:55 +02:00
zadam 9f2545395d better value matching regex 2020-07-04 11:14:11 +02:00
zadam 67bffbf30b consistency checks will now fix incorrectly named attributes 2020-07-04 11:02:05 +02:00
zadam 51dae378a3 more cleanup 2020-07-04 10:29:17 +02:00
zadam a0b3bc858d removed attributes dialog 2020-07-04 10:18:01 +02:00
zadam 2e24111c2b wip 2020-07-04 00:40:41 +02:00
zadam 69d529ada1 wip 2020-07-04 00:20:23 +02:00
zadam bfa69a3dc3 closing of attr detail 2020-07-03 22:27:45 +02:00
zadam 5b862c3d29 Merge remote-tracking branch 'origin/stable' 2020-07-02 23:21:17 +02:00
zadam dee4083bf3 improve request logging 2020-07-02 23:15:37 +02:00
zadam 18749092ff sql_init/migration fixes 2020-07-02 22:57:17 +02:00
zadam c4cc48dfc9 fixed initial demo import 2020-07-02 21:08:18 +02:00
zadam ef847b9904 fix search results 2020-07-02 20:19:09 +02:00
zadam 3e189d5c10 fixes 2020-07-01 23:50:33 +02:00
zadam 46d3160da4 removed detail.css, added to individual type widgets 2020-07-01 23:35:00 +02:00
zadam 78a2c1753e consistency checks fixes 2020-07-01 22:42:59 +02:00
zadam f0b608ddec non-intrusive logging of sync errors 2020-07-01 21:33:52 +02:00
zadam 582429e762 updated content styles 2020-07-01 21:03:51 +02:00
zadam bf073690e0 fixing promoted attributes 2020-07-01 00:02:13 +02:00
zadam c012620338 removed now unused image minifying binaries 2020-06-30 23:41:13 +02:00
zadam 5e18e7dc67 html sanitize imported notes, #1137 2020-06-30 23:37:06 +02:00
zadam 51f094f87f image handling consistency fixes 2020-06-28 23:10:45 +02:00
zadam 262a4fa3c7 removed image minification using imagemin because of constant platform related issues 2020-06-28 22:36:42 +02:00
zadam c778e87683 wip 2020-06-27 00:40:35 +02:00
zadam dd62b306fd refactored attr detail into separate widget 2020-06-26 22:17:39 +02:00
zadam 1f05638609 attribute progress 2020-06-25 23:56:06 +02:00
zadam 92e49214c7 more attribute mockups (inherited attributes) 2020-06-24 23:56:39 +02:00
zadam 9615e25a67 fix merge problems 2020-06-24 22:29:53 +02:00
zadam a574fce13f Merge remote-tracking branch 'origin/stable' into syncification
# Conflicts:
#	package-lock.json
#	package.json
#	src/routes/custom.js
#	src/services/import/single.js
2020-06-24 22:08:31 +02:00
zadam 238df0fb40 fix SVG single file import as image and not as file, closes #1114 2020-06-24 21:47:50 +02:00
zadam 89356918f1 fix unescaped HTML in the tree node title, closes #1127 2020-06-24 21:07:55 +02:00
zadam 263b65997c hide "type around" controls in printed PDF, closes #1129 2020-06-24 20:44:00 +02:00
zadam 2b757bfccd upgrade ckeditor to 20.0.0 2020-06-24 16:17:39 +02:00
zadam 99d66ea89f mockup of hidable attributes 2020-06-24 00:02:54 +02:00
zadam c78ca4c9db fixed triggers to sort children of notes with "sorted" label, closes #1126 2020-06-23 22:03:01 +02:00
zadam b245b249d3 got rid of simple-node-logger in favor of simple custom logger 2020-06-23 13:38:27 +02:00
zadam a0395e9866 release 0.43.1 2020-06-23 10:11:17 +02:00
zadam 89aa4fbc73 electron 9.0.5 2020-06-23 10:10:59 +02:00
zadam 74a7802088 fix custom resource handler, closes #1125 2020-06-22 23:13:53 +02:00
zadam a89b6711d1 refactored code to not depend on external elements, #1120 2020-06-22 22:28:45 +02:00
zadam b2549b2834 Merge remote-tracking branch 'origin/stable' into stable 2020-06-22 22:00:22 +02:00
zadam 959c4cbe64 removed icon tooltip again 2020-06-22 22:00:08 +02:00
Shon Ramamurthy d03d3603d2 Add optional support for note title tooltips under note tree widget (#1120)
* Add support for note title tooltips under note tree widget

This change adds an option to set the 'tooltip' configuration of the
Fancytree component. This allows tooltips containing the note title to
be displayed when a hover is performed over a note title in the tree
widget.

* Revert DB Upgrade

The db upgrade is reverted as this is not required for options.

* Simplify boolean option comparison

With this change, the existing 'is(key)' method is used to perform
tooltip enable option boolean comparison.

* Display tooltip only on center-pane overlap - Experimental

With this change, a straight-forward method to detect HTML element
overlap has been identified (source:
https://gist.github.com/jtsternberg/c272d7de5b967cec2d3d). It is now
possible to detect whether the center-pane element overlaps with the
Fancytree node title-bar. Using this approach we now have a rough
implementation which only displays a note-title tooltip when there is a
center-pane overlap.

At this stage, this change is experimental and the following needs to be
further addressed,
 - Register the 'mouseenter' event handler in an appropriate place. The
   current placement of this event handler is only for testing.
 - This change is now enabled by default. It needs to be seen whether it
   would still make sense to disable it via an option.

* Remove option to set tooltip

With this change, the tooltip options menu item has been removed as it
becomes relevant to have this feature enabled by default.

* Revert further changes related to the options menu

Further changes are rolled back which was earlier related to the tooltip
options setting. Some of these were missed in the previous commit.

* Remove debug logging

Remove debug logging and unnecessary line breaks.

* Move note-title tooltip handler under note_tree.js

With this change, we move the definition for the note-title tooltip
handler inside 'note_tree.js'. Registration is done inside
'side_pane_toggles.js' as we would need the handler to detect the
'center-pane' element first before detecting collisions.
2020-06-22 21:58:58 +02:00
zadam 22302e8200 attrs WIP 2020-06-21 23:41:51 +02:00
zadam f117ae4915 fix sending sync rows via WebSocket after transaction is committed 2020-06-21 13:44:47 +02:00
zadam c34a9b96e4 further simplification - now using better-sqlite3 native transaction API 2020-06-21 13:33:56 +02:00
zadam f0acfaf147 simplification of transaction handling 2020-06-21 13:15:36 +02:00
zadam e1c2573778 add tooltip to fancytree node icon, #1120 2020-06-21 12:47:24 +02:00
zadam 56d6384ae1 added protected note full text search 2020-06-20 23:46:49 +02:00
zadam 5f699cc28c converted most dynamic SQL queries into prepared statement to avoid excessive statement caching 2020-06-20 23:24:34 +02:00
zadam 969f31dde2 fixed backup and anonymization with better-sqlite3 2020-06-20 23:09:34 +02:00
zadam 027afab6b1 fix DB setup 2020-06-20 21:42:41 +02:00
zadam 6207203b35 wip 2020-06-20 13:18:03 +02:00
zadam 88348c560c syncification 2020-06-20 12:31:38 +02:00
zadam 30062d687f Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
2020-06-20 09:40:11 +02:00
zadam ffc96ad6b2 parser status indication 2020-06-20 09:39:44 +02:00
zadam 2af2b45062 fix keyboard shortcut for print this note, #1118 2020-06-20 00:04:31 +02:00
zadam eabe4775bd fix click handler of links inside included note 2020-06-19 23:20:52 +02:00
zadam da9b321aa0 allow mouse interactions in ckeditor widgets, fixes #1117 2020-06-19 22:24:57 +02:00
zadam 7b0aa7ab0b parser status indication 2020-06-18 23:53:57 +02:00
zadam f700e6e12b use standard search to find notes with same attrs 2020-06-18 22:28:18 +02:00
zadam a87e59cecb WIP of attribute view on click 2020-06-18 12:52:16 +02:00
zadam a04aa6fd36 version updates 2020-06-18 09:12:30 +02:00
zadam a7d9870846 Merge remote-tracking branch 'origin/better-sqlite3'
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/services/utils.js
#	src/public/app/widgets/type_widgets/editable_text.js
#	src/services/utils.js
2020-06-18 09:03:09 +02:00
zadam c18d8d2d1b add back lost edited notes widget, closes #1115 2020-06-18 08:56:23 +02:00
zadam f745e21e0d use better-sqlite3 2020-06-17 23:03:46 +02:00
zadam 5f2361ebd5 release 0.43.0-beta 2020-06-15 23:26:12 +02:00
zadam 9791dab97d recent changes sorting fixes, closes #1099 2020-06-15 23:22:11 +02:00
zadam 85d986534d fix enforcing node's http requests for sync 2020-06-15 18:24:43 +02:00
zadam 00faf758e8 fixes and polish 2020-06-15 17:56:53 +02:00
zadam 6ba2e5cf73 add word count widget to the demo document (plus cleanup of external links) 2020-06-14 16:29:29 +02:00
zadam fb3876d28b promoted attr selection using autocomplete will trigger change event to save it, closes #699 2020-06-14 16:04:00 +02:00
zadam fb975849b9 small API additions 2020-06-14 14:30:57 +02:00
zadam 16fef78344 add API method to force refresh of included notes, closes #1106 2020-06-14 10:50:08 +02:00
zadam e0b4b369dc transaction handling fixes 2020-06-14 00:35:53 +02:00
zadam 0df7851214 fix sync 2020-06-13 22:34:15 +02:00
zadam 5d47c2b23e opening transactions only on write operations which enforces exclusive lock only there to improve concurrency, custom handling of sync request timeouts, #1093, #1018 2020-06-13 10:23:36 +02:00
zadam d09b021487 add time limit to frontend update 2020-06-11 00:13:56 +02:00
zadam 910bda860c fix delete note function just work one time, closes #1101 2020-06-10 23:43:59 +02:00
zadam 2d92b4931a fix ctrl+click opening the link twice/thrice, closes #1094 2020-06-10 00:10:27 +02:00
zadam 212b719ee9 better detection of changes in attributes and how they affect notes 2020-06-09 22:59:22 +02:00
zadam 1db892d22f return the ability to hide archived notes, closes #1095 2020-06-08 23:15:49 +02:00
zadam 535dcb6d12 release 0.42.7 2020-06-08 10:43:12 +02:00
zadam 4426362799 cleanup sqlite to make the distributed archives smaller 2020-06-08 10:42:40 +02:00
zadam 2c609e8136 promoted attributes widget is now auto-updating, fixes #700 2020-06-08 00:29:52 +02:00
zadam 11b73b79ed refresh promoted attributes when change detected 2020-06-07 23:57:10 +02:00
zadam 28dc6b93ca lock CPU info for perf context 2020-06-07 23:56:51 +02:00
zadam e70c862e72 fix import 2020-06-07 23:55:55 +02:00
zadam b3e66d5a83 fixed command line anonymization 2020-06-07 10:45:41 +02:00
zadam e8cd821e57 futrther improvements to anonymization 2020-06-07 10:20:48 +02:00
zadam 401a3f0ecb add info on read only notes, #1088 2020-06-06 18:46:45 +02:00
zadam e73dffad0b parse incomplete attrs 2020-06-06 12:56:24 +02:00
zadam ef1d062745 attribute parser preserves indexes from original string 2020-06-06 10:39:27 +02:00
zadam f245d51746 basic saving of attributes in the widget 2020-06-05 17:25:14 +02:00
zadam be7ac74235 better fallback for resolving filenames of binary attachments 2020-06-05 10:40:35 +02:00
zadam ad48b59893 no need to reload whole subtree while moving notes 2020-06-05 00:07:45 +02:00
zadam e817acba4e fix template attribute cycle in note cache 2020-06-04 23:58:31 +02:00
zadam 4ae965c5cb Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/public/app/widgets/collapsible_widgets/note_info.js
2020-06-04 22:37:04 +02:00
zadam 58fa0832f6 fix focusing title after creating a note 2020-06-04 21:44:34 +02:00
zadam 1502b9ce66 prevent attribute inheritance cycle via template, closes #1077 2020-06-04 12:27:41 +02:00
zadam ed9fbae65d attribute parser and tests WIP 2020-06-04 00:04:57 +02:00
zadam 01a7af965c refactoring of es6 test skeleton 2020-06-03 17:28:57 +02:00
zadam 99120be46d skeleton of first tests 2020-06-03 17:11:03 +02:00
zadam 915b1d1a45 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/widgets/type_widgets/editable_text.js
2020-06-03 16:25:45 +02:00
zadam e68aed2057 Merge remote-tracking branch 'origin/master' 2020-06-03 16:24:52 +02:00
zadam eedeaca37d wip 2020-06-03 16:24:41 +02:00
zadam 7307ca385f release 0.42.6 2020-06-03 14:30:07 +02:00
zadam c1fd9825aa fix backup 2020-06-03 12:16:16 +02:00
zadam 9de7d3fc53 fix unloading protected session after clicking on a button, closes #1078 2020-06-03 11:47:30 +02:00
zadam 3c5db844ba fix tree focusing issues 2020-06-03 11:06:45 +02:00
zadam e7330c1104 more anonymization 2020-06-03 09:55:05 +02:00
zadam ec4586b164 fix reference link implementation, closes #1069 2020-06-02 23:54:33 +02:00
zadam 91e5f24798 fix db anonymization 2020-06-02 23:13:55 +02:00
zadam 38723e0189 release 0.42.5 2020-05-31 23:33:30 +02:00
zadam 8c88ce6f65 fix moving/cloning notes broken in 0.42.4, closes #1066 2020-05-31 22:33:02 +02:00
Adam Coyne 0def5f9a63 Add a VSCode debug configuration matching the start-server npm script (#1061) 2020-05-31 12:40:53 +02:00
zadam 4d22959e28 release 0.42.4 2020-05-31 10:33:12 +02:00
zadam 50a28d8c51 the node you start dragging should be included even if not selected 2020-05-31 10:32:35 +02:00
zadam e25b633ec4 better error logging in backup 2020-05-31 10:24:59 +02:00
Adam Coyne ac10701b55 Add import option to replace underscores with spaces in note names (#1064) 2020-05-30 23:15:00 +02:00
zadam 75bd395669 fix extra refresh because of duplicated sync event, closes #1063 2020-05-30 22:35:18 +02:00
zadam 5e353a5612 improved drag & drop 2020-05-30 10:30:21 +02:00
Adam Coyne c0cd321118 Fix import error (#1060)
* Fix access to attributes on undefined noteMeta

* Remove .markdown extension from imported page titles
2020-05-30 10:09:10 +02:00
zadam d65624d8d2 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
2020-05-29 22:29:28 +02:00
zadam 6b359b7796 return 401 when auth request is out of sync, closes #1056 2020-05-29 22:06:36 +02:00
zadam 13f9d037dc safer backup to file using VACUUM INTO + possibility to explicitly ask for backup now 2020-05-29 21:55:08 +02:00
zadam 1911d64c1c fix long filename overflowing, closes #1052 2020-05-29 20:36:48 +02:00
Ionuț Staicu 1c388c9805 cross platform compatibility (#1051) 2020-05-29 12:01:20 +02:00
zadam 6a957eff17 added autocompletes for labels, relations 2020-05-28 23:59:08 +02:00
zadam 5aaa429203 WIP of new attribute widget 2020-05-28 00:17:13 +02:00
zadam d4c3f1b3f2 upgrade to ckeditor 19.1.0 2020-05-27 22:08:06 +02:00
zadam ae934720bc Merge branch 'm43' 2020-05-27 00:09:51 +02:00
zadam 753c181979 Merge remote-tracking branch 'origin/stable' 2020-05-27 00:09:40 +02:00
zadam 55b210d7c5 added not() expression 2020-05-27 00:09:19 +02:00
zadam dc2d5a0a79 fix fulltext content search 2020-05-26 23:25:13 +02:00
zadam c753f228ac more tests & fixes 2020-05-25 23:39:34 +02:00
zadam a1a744bb00 order & limit implementation WIP 2020-05-25 00:25:47 +02:00
zadam 077d19b44b Create SECURITY.md 2020-05-24 19:34:52 +02:00
zadam b5627b138a integrate new search into the main global search 2020-05-24 09:30:08 +02:00
zadam cb4d0624b5 put session directory into data dir to avoid conflict of multiple instances on a single server, fixes #1033 2020-05-24 00:21:20 +02:00
zadam e2490f9975 faster implementation of ancestors 2020-05-23 23:57:59 +02:00
zadam 9ede77aead added ancestor 2020-05-23 23:44:55 +02:00
zadam 8ce2afff8a more tests 2020-05-23 22:18:06 +02:00
zadam a2e1fb35b8 tests for note properties 2020-05-23 20:52:55 +02:00
zadam bb03a8714a more tests 2020-05-23 18:42:32 +02:00
zadam ae772288e2 support for long syntax of labels and relations 2020-05-23 18:13:35 +02:00
zadam 355ffd3d02 added querying by relation's properties 2020-05-23 12:27:44 +02:00
zadam 3d12341ff1 added querying by children 2020-05-23 10:36:49 +02:00
zadam 4ea934509e implemented property based access + parent 2020-05-23 10:25:22 +02:00
zadam 3db84daf94 fix hiding autocompletes after closing tab, closes #1034 2020-05-22 19:30:21 +02:00
zadam 714881ad99 more search tests + numeric label comparison 2020-05-22 19:08:06 +02:00
zadam ee053b9fdf basic search tests 2020-05-22 09:38:30 +02:00
zadam cd48135394 refactoring to allow unit tests of the whole search subsystem 2020-05-21 14:05:56 +02:00
zadam a06662f4ce fuzzy search for values as well 2020-05-21 13:45:18 +02:00
zadam 2e6395ad88 prefix match for autocomplete attribute search 2020-05-21 12:05:12 +02:00
zadam 75d8627f1c refactoring to ParserContext 2020-05-21 11:46:01 +02:00
zadam a8d12f723f fix highlighting 2020-05-21 11:18:15 +02:00
zadam 08dbf90a8c hide body during startup to reduce flicker 2020-05-21 09:42:25 +02:00
zadam 32dde426fd apply new query parsing to note autocomplete 2020-05-21 00:39:17 +02:00
zadam b26100479d parser tests added 2020-05-20 23:20:39 +02:00
zadam faf4daa577 shadow on hover for title bar buttons 2020-05-20 19:14:07 +02:00
zadam 2526715aa4 release 0.42.3 2020-05-20 08:54:55 +02:00
zadam 04c573e212 set default executors 2020-05-20 08:54:37 +02:00
zadam 99aa481ace refactoring for testing parser 2020-05-20 00:03:33 +02:00
zadam ef37bc1a99 Merge remote-tracking branch 'origin/stable' into m43
# Conflicts:
#	.idea/dataSources.xml
2020-05-19 23:20:32 +02:00
zadam 58f4f5d1e6 fix deadlock after "cut to note", closes #1030 2020-05-19 22:58:08 +02:00
zadam b72dc977e6 parens handler + parser in progress 2020-05-19 00:00:35 +02:00
zadam 81bf84f2de lexer fixes + tests 2020-05-17 23:14:24 +02:00
zadam fa5d982a55 fix exporting root note, closes #1024 2020-05-17 21:07:54 +02:00
zadam e77e0ce675 lexer impl WIP + test 2020-05-17 19:43:37 +02:00
zadam 32eaafd024 note cache fixes after refactoring 2020-05-17 10:11:19 +02:00
zadam 60c2049729 note cache refactoring WIP 2020-05-17 09:48:24 +02:00
zadam dcd371b5b1 note cache breakup into classes, WIP 2020-05-16 23:12:29 +02:00
zadam e3071e630a note cache refactoring WIP 2020-05-16 22:11:09 +02:00
zadam 78ea0b4ba9 refactoring ... 2020-05-15 23:50:36 +02:00
zadam f07025f741 start of note cache expression implementation 2020-05-15 11:04:55 +02:00
zadam 5f1f65a3c2 fuction reorganization 2020-05-14 23:21:48 +02:00
zadam a3e2369599 add also content fulltext 2020-05-14 23:11:59 +02:00
zadam 1ec446137d fulltext also searches for branch prefixes 2020-05-14 21:30:36 +02:00
zadam 108afe8896 fix incorrect processing of sync rows, closes #1019 2020-05-14 13:08:06 +02:00
zadam a287bb59ea note cache fixes for created notes 2020-05-13 23:06:13 +02:00
zadam 7992f32d34 note cache refactoring 2020-05-13 14:42:16 +02:00
zadam b07accfd9d note cache refactoring + handling entity changes 2020-05-13 10:47:22 +02:00
zadam ccb5f3ee18 searching now works correctly in inherited attributes 2020-05-13 00:01:10 +02:00
zadam 29e6b63f82 Merge remote-tracking branch 'origin/master' into m43 2020-05-12 21:15:54 +02:00
zadam 2818854c4b Merge remote-tracking branch 'origin/stable' 2020-05-12 21:15:32 +02:00
zadam d75b770fb9 update of bootstrap to 4.5.0 2020-05-12 20:17:51 +02:00
zadam 37da0adb8a release 0.42.2 2020-05-12 16:46:45 +02:00
zadam 13117d2e68 Merge remote-tracking branch 'origin/stable' 2020-05-12 13:41:06 +02:00
zadam 4f50864ec8 better UX when deleting notes - focus in note tree is moved to the next/previous note 2020-05-12 13:40:42 +02:00
zadam 30b9ef8604 fix tab title of deleted note 2020-05-12 12:45:32 +02:00
zadam b063b4c528 read only view images should not overflow 2020-05-12 12:28:59 +02:00
zadam b51f5ac6fd Merge remote-tracking branch 'origin/stable' 2020-05-12 10:59:02 +02:00
zadam e08b0141a4 when expanding/collpasing, set the flag also to the tree cache 2020-05-12 10:52:07 +02:00
zadam 9d8b8e26a1 attach extension to download file if note present 2020-05-12 10:28:31 +02:00
zadam cb70109ee7 fix creating new promoted attributes, closes #1008
(cherry picked from commit 2e0fb8aaf1)
2020-05-12 00:00:59 +02:00
zadam 2e0fb8aaf1 fix creating new promoted attributes, closes #1008 2020-05-11 23:57:39 +02:00
zadam ac4e6077bd Merge remote-tracking branch 'origin/stable' 2020-05-11 23:23:59 +02:00
zadam 8e8fa48241 ws update 2020-05-11 23:23:18 +02:00
zadam e541abbd60 disable hiding the body to not hide the noscript element 2020-05-11 22:44:10 +02:00
Naveen M V 940a70adc5 Fix regex bug (#1005)
(cherry picked from commit 9a662f76da)
2020-05-11 22:06:39 +02:00
Naveen M V 9a662f76da Fix regex bug (#1005) 2020-05-11 22:06:22 +02:00
zadam 88e8eb7e9c fixed context menu positioning when scaling is active 2020-05-11 20:08:55 +02:00
zadam b365c186a1 fixed clicking on links in read only view 2020-05-11 19:38:14 +02:00
zadam 15bc9dce1c search overhaul WIP 2020-05-10 23:27:53 +02:00
zadam 552fc5261a new note cache WIP 2020-05-09 23:42:26 +02:00
zadam 83c9e6e846 Merge branch 'master' into m43 2020-05-09 20:17:26 +02:00
zadam 2e837642e2 create note directly from mention linking 2020-05-09 14:25:27 +02:00
zadam c70a842bc6 Merge remote-tracking branch 'origin/stable' 2020-05-08 23:44:51 +02:00
zadam d20415c979 bind global menu item "Open SQL console" to the logic to create such a note 2020-05-08 23:39:46 +02:00
zadam c3438e0f3f implemented SQL console as a type of code note 2020-05-08 22:22:43 +02:00
zadam 64c9734f05 transform setup.js to the webpacked version in the build 2020-05-08 20:50:53 +02:00
zadam 48c843c087 fix setup on server edition 2020-05-08 10:24:57 +02:00
zadam 1bb895bb83 Merge remote-tracking branch 'origin/stable' 2020-05-07 23:36:11 +02:00
zadam 0e4eec10b9 added "restore this revision" button 2020-05-07 23:34:13 +02:00
zadam a3661cb763 fix display of buttons for revisions when there is none 2020-05-07 23:14:21 +02:00
zadam 115879ec4a fix note revisions displaying wrong tooltip 2020-05-07 23:02:46 +02:00
zadam f1ce0c7774 Merge branch 'm43-2'
# Conflicts:
#	src/public/app/services/app_context.js
#	src/public/app/widgets/run_script_buttons.js
2020-05-07 20:57:22 +02:00
zadam df11b076bc release 0.42.1 2020-05-06 23:24:13 +02:00
MeIchthys 54ecd2ee75 Prevent td text from overlapping th text (#1002)
This makes all of the Note Info sections more consistent with each other. It prevents overlapping of text when the window is displayed in a small-width environment.
2020-05-06 23:12:28 +02:00
zadam 2369bcf9fc fixes for image download 2020-05-06 23:11:34 +02:00
zadam 5d8808a2ad fix renaming existing attributes + added new label autoReadOnlyDisabled to control automatic setting to readOnly mode 2020-05-06 21:41:14 +02:00
zadam 62b993f06f fix closing tab by mouse 2020-05-06 21:24:51 +02:00
zadam 8aa5608085 fix "Render note" and "Execute script" buttons + refactoring around data-trigger-command handling 2020-05-06 00:00:14 +02:00
zadam b452d7e5c5 Merge remote-tracking branch 'origin/stable' 2020-05-06 00:00:01 +02:00
zadam a0f8caeccd added SQLite (Trilium) mime type 2020-05-05 23:59:26 +02:00
zadam edb9bc9229 fix "Render note" and "Execute script" buttons + refactoring around data-trigger-command handling 2020-05-05 23:58:52 +02:00
zadam 9b9d6d86d0 remove debugging console.log 2020-05-05 22:51:53 +02:00
zadam 7f2755d4a0 refresh button state change on note update 2020-05-05 22:18:09 +02:00
zadam 3b268cc8eb fix selecting note title after creation, closes #997 2020-05-05 21:42:18 +02:00
zadam 768ac83e14 Merge branch 'master' into m43 2020-05-05 19:38:42 +02:00
zadam 6dfe335707 added global menu item to open new empty window + some refactoring 2020-05-05 19:30:03 +02:00
zadam c7125d2b50 createNoteAfter should have saveSelection: false 2020-05-05 19:09:01 +02:00
zadam e8a33a5ee7 fix note title not updating when changing the title 2020-05-05 18:56:12 +02:00
zadam deb0b24c4c release 0.42.0-beta 2020-05-04 21:59:14 +02:00
zadam cafcb67a8a remove dangling autocompletes after closing the tab 2020-05-04 21:58:40 +02:00
zadam 4c6e9480e4 revert #980 because of performance issues 2020-05-04 21:49:03 +02:00
zadam 109bead1c7 removed unnecessary async/awaits 2020-05-04 10:19:11 +02:00
zadam ae1220b970 remove debug 2020-05-04 10:04:50 +02:00
zadam b89a2df462 fix image being redownloaded from localhost 2020-05-04 10:03:54 +02:00
zadam 8b5536ee3a note title widget and protected session entering fixes 2020-05-03 22:49:20 +02:00
zadam 647790885d downgrade sqlite3 library which has issues with electron build 2020-05-03 21:27:24 +02:00
zadam 227c3e4dcc fixes for offline downloading of images 2020-05-03 14:33:59 +02:00
zadam 4eb2407c73 fix folder icon for hidden included images 2020-05-03 13:59:49 +02:00
zadam 43e12fbea2 small fixes for collapse/expand 2020-05-03 13:52:12 +02:00
zadam 2a3091f788 reimplemented expand/collapse differently for better performance 2020-05-03 13:15:08 +02:00
zadam 742df25bc2 collapse/expand only folder notes 2020-05-03 09:49:56 +02:00
zadam 7ac2206e9b start of search overhaul 2020-05-03 09:18:57 +02:00
zadam 9be1d1f697 add note attribute cache to speed up tree loading 2020-05-02 18:19:41 +02:00
zadam ed52f93bbb tree settings popup fixes 2020-05-02 13:52:02 +02:00
zadam 3466a19397 protection against recursive expansion of search notes 2020-05-02 12:16:48 +02:00
zadam fe53e2351c basic implementation of note tree's config 2020-05-02 00:28:40 +02:00
zadam 5c35b870eb added titles with full date time including timezone offset also to note revisions dialog/widget 2020-05-01 00:01:53 +02:00
zadam 90d091aedb make note tree initial load non-lazy 2020-04-30 23:58:34 +02:00
zadam 0a05a40186 fix expand subtree's conflict with auto-lazy loading 2020-04-30 23:09:25 +02:00
zadam 7482ed063b Merge remote-tracking branch 'origin/stable' 2020-04-29 23:27:39 +02:00
zadam 70e343f2fc fix showing deleted notes in "recent changes" dialog, closes #994 2020-04-29 23:25:34 +02:00
zadam 358f3a7291 implement "expand subtree" contet menu, closes #993 2020-04-29 23:13:05 +02:00
zadam 6161b1c193 Merge remote-tracking branch 'origin/stable' 2020-04-29 22:27:46 +02:00
zadam 94b57dadd7 removed link context menu on JS-only links 2020-04-29 22:27:22 +02:00
zadam 81fbefb9cd added scripts for running trilium as "portable" 2020-04-29 21:55:57 +02:00
zadam 6d6695e3a9 ckeditor 19 2020-04-29 17:29:32 +02:00
zadam 4c308ad68f moved protected note switch to "note actions", added shadow to protected note title 2020-04-29 00:01:07 +02:00
zadam 989a003d2f borderless title bar buttons 2020-04-28 21:55:54 +02:00
zadam ccdb41841e release 0.41.6 2020-04-27 23:46:48 +02:00
zadam 0a94622413 fix drag and drop in the tree, closes #984 2020-04-27 23:39:10 +02:00
zadam 5769587305 experimental hiding of images if they are included in the parent note 2020-04-27 23:27:45 +02:00
zadam ffbfccb701 extra window now works in browsers too 2020-04-27 22:29:39 +02:00
zadam 56ce23fc36 fix collapsing of note revisions 2020-04-27 22:13:32 +02:00
zadam cba7e5a59f fix collapsing of note revisions 2020-04-27 21:44:25 +02:00
zadam 86cf8f3202 fix download/export 2020-04-27 20:58:31 +02:00
zadam 907cdd8fcb fixes for extra window 2020-04-26 23:11:52 +02:00
zadam 7ea53d468e use local dates in the recent changes 2020-04-26 14:39:13 +02:00
zadam 586d6b4557 in web version use local client time instead of server time for recording dateModified etc. 2020-04-26 14:26:57 +02:00
zadam 8f68ff1932 tweaks for the code preview 2020-04-26 12:06:54 +02:00
zadam a1ea2c9115 read only code notes WIP 2020-04-26 11:38:30 +02:00
zadam e8ce81a133 organize widgets a bit 2020-04-26 09:40:02 +02:00
zadam aff12950f0 Merge remote-tracking branch 'origin/master' into m42
# Conflicts:
#	src/public/app/services/app_context.js
2020-04-25 23:53:19 +02:00
zadam 75c58cbf79 refactored layouts for extra window 2020-04-25 23:52:13 +02:00
zadam 87a1e98fa2 default search should look also into attribute names and values, #980 2020-04-25 22:10:56 +02:00
zadam d1eacbb574 more robust entering protected session and the following protection of a note 2020-04-25 17:15:57 +02:00
zadam 71d248cd87 touch protected session during note update 2020-04-25 11:09:07 +02:00
zadam ac608b9334 small text changes 2020-04-24 21:21:22 +02:00
zadam 32020d78b5 prototype for new app window 2020-04-23 23:08:15 +02:00
zadam ff853c7d0a implement lazy loading of tabs which speeds up especially initial startup with many tabs 2020-04-22 23:09:35 +02:00
zadam 8526cb2315 added collapsible widgets to the docs 2020-04-21 23:14:55 +02:00
zadam dc89f72e75 fix display of text notes in note revisions 2020-04-21 22:59:37 +02:00
zadam 657ff16267 fix build webpack 2020-04-20 23:14:50 +02:00
zadam ed759f5585 release 0.41.5 2020-04-20 22:40:02 +02:00
zadam a86177bb59 release 0.41.5 2020-04-20 22:39:23 +02:00
zadam 9f1b3cc892 note paths widget has context menu too 2020-04-20 22:38:37 +02:00
zadam 8473f72ec8 fix support of multiple languages for spellchecking + list all available languages, closes #974 2020-04-20 22:26:31 +02:00
zadam 666d202a3a deps updates 2020-04-19 09:42:10 +02:00
zadam 988fae50cb fix help links and displayed shortcuts, closes #971 2020-04-18 11:14:09 +02:00
zadam 98bbd17920 release 0.41.4-beta 2020-04-15 23:00:13 +02:00
zadam dadcc93ae3 focus and select title after creating a note 2020-04-15 22:06:52 +02:00
zadam 48e19d0149 fix webpack buidl 2020-04-15 21:49:36 +02:00
902 changed files with 95266 additions and 50799 deletions
+2 -2
View File
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="document.db" uuid="a2c75661-f9e2-478f-a69f-6a9409e69997">
<data-source source="LOCAL" name="document.db" uuid="4e69c96a-8a2b-43f5-9b40-d1608f75f7a4">
<driver-ref>sqlite.xerial</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/../trilium-data/document.db</jdbc-url>
<jdbc-url>jdbc:sqlite:$USER_HOME$/trilium-data/document.db</jdbc-url>
</data-source>
</component>
</project>
-662
View File
@@ -1,662 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<dataSource name="document.db">
<database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.17">
<root id="1">
<ServerVersion>3.25.1</ServerVersion>
</root>
<schema id="2" parent="1" name="main">
<Current>1</Current>
</schema>
<collation id="3" parent="1" name="BINARY"/>
<collation id="4" parent="1" name="NOCASE"/>
<collation id="5" parent="1" name="RTRIM"/>
<table id="6" parent="2" name="api_tokens"/>
<table id="7" parent="2" name="attributes"/>
<table id="8" parent="2" name="branches"/>
<table id="9" parent="2" name="note_contents"/>
<table id="10" parent="2" name="note_revision_contents"/>
<table id="11" parent="2" name="note_revisions"/>
<table id="12" parent="2" name="notes"/>
<table id="13" parent="2" name="options"/>
<table id="14" parent="2" name="recent_notes"/>
<table id="15" parent="2" name="source_ids"/>
<table id="16" parent="2" name="sqlite_master">
<System>1</System>
</table>
<table id="17" parent="2" name="sqlite_sequence">
<System>1</System>
</table>
<table id="18" parent="2" name="sync"/>
<column id="19" parent="6" name="apiTokenId">
<Position>1</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="20" parent="6" name="token">
<Position>2</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="21" parent="6" name="utcDateCreated">
<Position>3</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="22" parent="6" name="isDeleted">
<Position>4</Position>
<DataType>INT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>0</DefaultExpression>
</column>
<column id="23" parent="6" name="hash">
<Position>5</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&quot;&quot;</DefaultExpression>
</column>
<index id="24" parent="6" name="sqlite_autoindex_api_tokens_1">
<NameSurrogate>1</NameSurrogate>
<ColNames>apiTokenId</ColNames>
<Unique>1</Unique>
</index>
<key id="25" parent="6">
<ColNames>apiTokenId</ColNames>
<Primary>1</Primary>
<UnderlyingIndexName>sqlite_autoindex_api_tokens_1</UnderlyingIndexName>
</key>
<column id="26" parent="7" name="attributeId">
<Position>1</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="27" parent="7" name="noteId">
<Position>2</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="28" parent="7" name="type">
<Position>3</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="29" parent="7" name="name">
<Position>4</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="30" parent="7" name="value">
<Position>5</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&apos;&apos;</DefaultExpression>
</column>
<column id="31" parent="7" name="position">
<Position>6</Position>
<DataType>INT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>0</DefaultExpression>
</column>
<column id="32" parent="7" name="utcDateCreated">
<Position>7</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="33" parent="7" name="utcDateModified">
<Position>8</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="34" parent="7" name="isDeleted">
<Position>9</Position>
<DataType>INT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="35" parent="7" name="deleteId">
<Position>10</Position>
<DataType>TEXT|0s</DataType>
<DefaultExpression>NULL</DefaultExpression>
</column>
<column id="36" parent="7" name="hash">
<Position>11</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&quot;&quot;</DefaultExpression>
</column>
<column id="37" parent="7" name="isInheritable">
<Position>12</Position>
<DataType>int|0s</DataType>
<DefaultExpression>0</DefaultExpression>
</column>
<index id="38" parent="7" name="sqlite_autoindex_attributes_1">
<NameSurrogate>1</NameSurrogate>
<ColNames>attributeId</ColNames>
<Unique>1</Unique>
</index>
<index id="39" parent="7" name="IDX_attributes_noteId_index">
<ColNames>noteId</ColNames>
</index>
<index id="40" parent="7" name="IDX_attributes_name_value">
<ColNames>name
value</ColNames>
</index>
<index id="41" parent="7" name="IDX_attributes_value_index">
<ColNames>value</ColNames>
</index>
<key id="42" parent="7">
<ColNames>attributeId</ColNames>
<Primary>1</Primary>
<UnderlyingIndexName>sqlite_autoindex_attributes_1</UnderlyingIndexName>
</key>
<column id="43" parent="8" name="branchId">
<Position>1</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="44" parent="8" name="noteId">
<Position>2</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="45" parent="8" name="parentNoteId">
<Position>3</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="46" parent="8" name="notePosition">
<Position>4</Position>
<DataType>INTEGER|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="47" parent="8" name="prefix">
<Position>5</Position>
<DataType>TEXT|0s</DataType>
</column>
<column id="48" parent="8" name="isExpanded">
<Position>6</Position>
<DataType>INTEGER|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>0</DefaultExpression>
</column>
<column id="49" parent="8" name="isDeleted">
<Position>7</Position>
<DataType>INTEGER|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>0</DefaultExpression>
</column>
<column id="50" parent="8" name="deleteId">
<Position>8</Position>
<DataType>TEXT|0s</DataType>
<DefaultExpression>NULL</DefaultExpression>
</column>
<column id="51" parent="8" name="utcDateModified">
<Position>9</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="52" parent="8" name="utcDateCreated">
<Position>10</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="53" parent="8" name="hash">
<Position>11</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&quot;&quot;</DefaultExpression>
</column>
<index id="54" parent="8" name="sqlite_autoindex_branches_1">
<NameSurrogate>1</NameSurrogate>
<ColNames>branchId</ColNames>
<Unique>1</Unique>
</index>
<index id="55" parent="8" name="IDX_branches_noteId_parentNoteId">
<ColNames>noteId
parentNoteId</ColNames>
</index>
<index id="56" parent="8" name="IDX_branches_parentNoteId">
<ColNames>parentNoteId</ColNames>
</index>
<key id="57" parent="8">
<ColNames>branchId</ColNames>
<Primary>1</Primary>
<UnderlyingIndexName>sqlite_autoindex_branches_1</UnderlyingIndexName>
</key>
<column id="58" parent="9" name="noteId">
<Position>1</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="59" parent="9" name="content">
<Position>2</Position>
<DataType>TEXT|0s</DataType>
<DefaultExpression>NULL</DefaultExpression>
</column>
<column id="60" parent="9" name="hash">
<Position>3</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&quot;&quot;</DefaultExpression>
</column>
<column id="61" parent="9" name="utcDateModified">
<Position>4</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<index id="62" parent="9" name="sqlite_autoindex_note_contents_1">
<NameSurrogate>1</NameSurrogate>
<ColNames>noteId</ColNames>
<Unique>1</Unique>
</index>
<key id="63" parent="9">
<ColNames>noteId</ColNames>
<Primary>1</Primary>
<UnderlyingIndexName>sqlite_autoindex_note_contents_1</UnderlyingIndexName>
</key>
<column id="64" parent="10" name="noteRevisionId">
<Position>1</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="65" parent="10" name="content">
<Position>2</Position>
<DataType>TEXT|0s</DataType>
</column>
<column id="66" parent="10" name="hash">
<Position>3</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&apos;&apos;</DefaultExpression>
</column>
<column id="67" parent="10" name="utcDateModified">
<Position>4</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<index id="68" parent="10" name="sqlite_autoindex_note_revision_contents_1">
<NameSurrogate>1</NameSurrogate>
<ColNames>noteRevisionId</ColNames>
<Unique>1</Unique>
</index>
<key id="69" parent="10">
<ColNames>noteRevisionId</ColNames>
<Primary>1</Primary>
<UnderlyingIndexName>sqlite_autoindex_note_revision_contents_1</UnderlyingIndexName>
</key>
<column id="70" parent="11" name="noteRevisionId">
<Position>1</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="71" parent="11" name="noteId">
<Position>2</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="72" parent="11" name="title">
<Position>3</Position>
<DataType>TEXT|0s</DataType>
</column>
<column id="73" parent="11" name="contentLength">
<Position>4</Position>
<DataType>INT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="74" parent="11" name="isErased">
<Position>5</Position>
<DataType>INT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>0</DefaultExpression>
</column>
<column id="75" parent="11" name="isProtected">
<Position>6</Position>
<DataType>INT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>0</DefaultExpression>
</column>
<column id="76" parent="11" name="utcDateLastEdited">
<Position>7</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="77" parent="11" name="utcDateCreated">
<Position>8</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="78" parent="11" name="utcDateModified">
<Position>9</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="79" parent="11" name="dateLastEdited">
<Position>10</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="80" parent="11" name="dateCreated">
<Position>11</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="81" parent="11" name="type">
<Position>12</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&apos;&apos;</DefaultExpression>
</column>
<column id="82" parent="11" name="mime">
<Position>13</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&apos;&apos;</DefaultExpression>
</column>
<column id="83" parent="11" name="hash">
<Position>14</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&apos;&apos;</DefaultExpression>
</column>
<index id="84" parent="11" name="sqlite_autoindex_note_revisions_1">
<NameSurrogate>1</NameSurrogate>
<ColNames>noteRevisionId</ColNames>
<Unique>1</Unique>
</index>
<index id="85" parent="11" name="IDX_note_revisions_noteId">
<ColNames>noteId</ColNames>
</index>
<index id="86" parent="11" name="IDX_note_revisions_utcDateLastEdited">
<ColNames>utcDateLastEdited</ColNames>
</index>
<index id="87" parent="11" name="IDX_note_revisions_utcDateCreated">
<ColNames>utcDateCreated</ColNames>
</index>
<index id="88" parent="11" name="IDX_note_revisions_dateLastEdited">
<ColNames>dateLastEdited</ColNames>
</index>
<index id="89" parent="11" name="IDX_note_revisions_dateCreated">
<ColNames>dateCreated</ColNames>
</index>
<key id="90" parent="11">
<ColNames>noteRevisionId</ColNames>
<Primary>1</Primary>
<UnderlyingIndexName>sqlite_autoindex_note_revisions_1</UnderlyingIndexName>
</key>
<column id="91" parent="12" name="noteId">
<Position>1</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="92" parent="12" name="title">
<Position>2</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&quot;note&quot;</DefaultExpression>
</column>
<column id="93" parent="12" name="contentLength">
<Position>3</Position>
<DataType>INT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="94" parent="12" name="isProtected">
<Position>4</Position>
<DataType>INT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>0</DefaultExpression>
</column>
<column id="95" parent="12" name="type">
<Position>5</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&apos;text&apos;</DefaultExpression>
</column>
<column id="96" parent="12" name="mime">
<Position>6</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&apos;text/html&apos;</DefaultExpression>
</column>
<column id="97" parent="12" name="hash">
<Position>7</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&quot;&quot;</DefaultExpression>
</column>
<column id="98" parent="12" name="isDeleted">
<Position>8</Position>
<DataType>INT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>0</DefaultExpression>
</column>
<column id="99" parent="12" name="deleteId">
<Position>9</Position>
<DataType>TEXT|0s</DataType>
<DefaultExpression>NULL</DefaultExpression>
</column>
<column id="100" parent="12" name="isErased">
<Position>10</Position>
<DataType>INT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>0</DefaultExpression>
</column>
<column id="101" parent="12" name="dateCreated">
<Position>11</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="102" parent="12" name="dateModified">
<Position>12</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="103" parent="12" name="utcDateCreated">
<Position>13</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="104" parent="12" name="utcDateModified">
<Position>14</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<index id="105" parent="12" name="sqlite_autoindex_notes_1">
<NameSurrogate>1</NameSurrogate>
<ColNames>noteId</ColNames>
<Unique>1</Unique>
</index>
<index id="106" parent="12" name="IDX_notes_title">
<ColNames>title</ColNames>
</index>
<index id="107" parent="12" name="IDX_notes_type">
<ColNames>type</ColNames>
</index>
<index id="108" parent="12" name="IDX_notes_isDeleted">
<ColNames>isDeleted</ColNames>
</index>
<index id="109" parent="12" name="IDX_notes_dateCreated">
<ColNames>dateCreated</ColNames>
</index>
<index id="110" parent="12" name="IDX_notes_dateModified">
<ColNames>dateModified</ColNames>
</index>
<index id="111" parent="12" name="IDX_notes_utcDateCreated">
<ColNames>utcDateCreated</ColNames>
</index>
<index id="112" parent="12" name="IDX_notes_utcDateModified">
<ColNames>utcDateModified</ColNames>
</index>
<key id="113" parent="12">
<ColNames>noteId</ColNames>
<Primary>1</Primary>
<UnderlyingIndexName>sqlite_autoindex_notes_1</UnderlyingIndexName>
</key>
<column id="114" parent="13" name="name">
<Position>1</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="115" parent="13" name="value">
<Position>2</Position>
<DataType>TEXT|0s</DataType>
</column>
<column id="116" parent="13" name="isSynced">
<Position>3</Position>
<DataType>INTEGER|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>0</DefaultExpression>
</column>
<column id="117" parent="13" name="hash">
<Position>4</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&quot;&quot;</DefaultExpression>
</column>
<column id="118" parent="13" name="utcDateCreated">
<Position>5</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="119" parent="13" name="utcDateModified">
<Position>6</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<index id="120" parent="13" name="sqlite_autoindex_options_1">
<NameSurrogate>1</NameSurrogate>
<ColNames>name</ColNames>
<Unique>1</Unique>
</index>
<key id="121" parent="13">
<ColNames>name</ColNames>
<Primary>1</Primary>
<UnderlyingIndexName>sqlite_autoindex_options_1</UnderlyingIndexName>
</key>
<column id="122" parent="14" name="noteId">
<Position>1</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="123" parent="14" name="notePath">
<Position>2</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="124" parent="14" name="hash">
<Position>3</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>&quot;&quot;</DefaultExpression>
</column>
<column id="125" parent="14" name="utcDateCreated">
<Position>4</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="126" parent="14" name="isDeleted">
<Position>5</Position>
<DataType>INT|0s</DataType>
</column>
<index id="127" parent="14" name="sqlite_autoindex_recent_notes_1">
<NameSurrogate>1</NameSurrogate>
<ColNames>noteId</ColNames>
<Unique>1</Unique>
</index>
<key id="128" parent="14">
<ColNames>noteId</ColNames>
<Primary>1</Primary>
<UnderlyingIndexName>sqlite_autoindex_recent_notes_1</UnderlyingIndexName>
</key>
<column id="129" parent="15" name="sourceId">
<Position>1</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="130" parent="15" name="utcDateCreated">
<Position>2</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<index id="131" parent="15" name="sqlite_autoindex_source_ids_1">
<NameSurrogate>1</NameSurrogate>
<ColNames>sourceId</ColNames>
<Unique>1</Unique>
</index>
<index id="132" parent="15" name="IDX_source_ids_utcDateCreated">
<ColNames>utcDateCreated</ColNames>
</index>
<key id="133" parent="15">
<ColNames>sourceId</ColNames>
<Primary>1</Primary>
<UnderlyingIndexName>sqlite_autoindex_source_ids_1</UnderlyingIndexName>
</key>
<column id="134" parent="16" name="type">
<Position>1</Position>
<DataType>text|0s</DataType>
</column>
<column id="135" parent="16" name="name">
<Position>2</Position>
<DataType>text|0s</DataType>
</column>
<column id="136" parent="16" name="tbl_name">
<Position>3</Position>
<DataType>text|0s</DataType>
</column>
<column id="137" parent="16" name="rootpage">
<Position>4</Position>
<DataType>int|0s</DataType>
</column>
<column id="138" parent="16" name="sql">
<Position>5</Position>
<DataType>text|0s</DataType>
</column>
<column id="139" parent="17" name="name">
<Position>1</Position>
</column>
<column id="140" parent="17" name="seq">
<Position>2</Position>
</column>
<column id="141" parent="18" name="id">
<Position>1</Position>
<DataType>INTEGER|0s</DataType>
<NotNull>1</NotNull>
<SequenceIdentity>1</SequenceIdentity>
</column>
<column id="142" parent="18" name="entityName">
<Position>2</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="143" parent="18" name="entityId">
<Position>3</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="144" parent="18" name="sourceId">
<Position>4</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<column id="145" parent="18" name="isSynced">
<Position>5</Position>
<DataType>INTEGER|0s</DataType>
<NotNull>1</NotNull>
<DefaultExpression>0</DefaultExpression>
</column>
<column id="146" parent="18" name="utcSyncDate">
<Position>6</Position>
<DataType>TEXT|0s</DataType>
<NotNull>1</NotNull>
</column>
<index id="147" parent="18" name="IDX_sync_entityName_entityId">
<ColNames>entityName
entityId</ColNames>
<Unique>1</Unique>
</index>
<index id="148" parent="18" name="IDX_sync_utcSyncDate">
<ColNames>utcSyncDate</ColNames>
</index>
<key id="149" parent="18">
<ColNames>id</ColNames>
<Primary>1</Primary>
</key>
</database-model>
</dataSource>
@@ -1,2 +0,0 @@
#n:main
!<md> [0, 0, null, null, -2147483648, -2147483648]
+1
View File
@@ -1,6 +1,7 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="JSUnfilteredForInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
<option name="processCode" value="true" />
<option name="processLiterals" value="true" />
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptLibraryMappings">
<file url="PROJECT" libraries="{@types/jquery}" />
<includedPredefinedLibrary name="Node.js Core" />
</component>
</project>
+1 -1
View File
@@ -3,7 +3,7 @@
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="ProjectRootManager">
<component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="openjdk-16" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
+1
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SqlDialectMappings">
<file url="file://$PROJECT_DIR$" dialect="SQLite" />
<file url="PROJECT" dialect="SQLite" />
</component>
</project>
Generated
+1 -1
View File
@@ -3,4 +3,4 @@
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
</project>
+18
View File
@@ -0,0 +1,18 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "start-server",
"skipFiles": [
"<node_internals>/**"
],
"env": {
"TRILIUM_ENV": "dev"
},
"outputCapture": "std",
"program": "${workspaceFolder}/src/www"
}
]
}
+3 -1
View File
@@ -1,4 +1,4 @@
FROM node:12.16.2-alpine
FROM node:12.19.0-alpine
# Create app directory
WORKDIR /usr/src/app
@@ -23,5 +23,7 @@ RUN set -x \
# Bundle app source
COPY . .
USER node
EXPOSE 8080
CMD [ "node", "./src/www" ]
+60
View File
@@ -0,0 +1,60 @@
# Trilium注意事项
[English](https://github.com/zadam/trilium/blob/master/README.md) | [Chinese](https://github.com/zadam/trilium/blob/master/README-ZH_CN.md) | [Russian](https://github.com/zadam/trilium/blob/master/README.ru.md)
[![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Trilium Notes是一个分层的笔记应用程序,专注于建立大型个人知识库。请参阅[屏幕截图](https://github.com/zadam/trilium/wiki/Screenshot-tour)以快速了解:
![](https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png)
## 特性
* 笔记可以排列成任意深的树。单个笔记可以放在树中的多个位置(请参阅[克隆](https://github.com/zadam/trilium/wiki/Cloning-notes)
* 丰富的所见即所得笔记编辑功能,包括带有markdown[自动格式化功能的](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)表格,图像和[数学](https://github.com/zadam/trilium/wiki/Text-notes#math-support)
* 支持编辑[使用源代码的笔记](https://github.com/zadam/trilium/wiki/Code-notes),包括语法高亮显示
* 笔记之间快速[导航](https://github.com/zadam/trilium/wiki/Note-navigation),全文搜索和[笔记挂起](https://github.com/zadam/trilium/wiki/Note-hoisting)
* 无缝[笔记版本控制](https://github.com/zadam/trilium/wiki/Note-revisions)
* 笔记[属性](https://github.com/zadam/trilium/wiki/Attributes)可用于笔记组织,查询和高级[脚本编写](https://github.com/zadam/trilium/wiki/Scripts)
* [同步](https://github.com/zadam/trilium/wiki/Synchronization)与自托管同步服务器
* 具有按笔记粒度的强大的[笔记加密](https://github.com/zadam/trilium/wiki/Protected-notes)
* [关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map),用于可视化笔记及其关系
* [脚本](https://github.com/zadam/trilium/wiki/Scripts)-请参阅[高级展示](https://github.com/zadam/trilium/wiki/Advanced-showcases)
* 可用性和性能均能很好地扩展至超过10万个笔记
* 针对智能手机和平板电脑进行触摸优化的[移动前端](https://github.com/zadam/trilium/wiki/Mobile-frontend)
* [夜间主题](https://github.com/zadam/trilium/wiki/Themes)
* [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import)和[Markdown导入导出](https://github.com/zadam/trilium/wiki/Markdown)
* [Web Clipper](https://github.com/zadam/trilium/wiki/Web-clipper)可轻松保存Web内容
## 构建
Trilium是作为桌面应用程序(Linux和Windows)或服务器上托管的Web应用程序(Linux)提供的。Mac OS桌面版本可用,但[不受支持](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support)。
* 如果要在桌面上使用Trilium,请从[最新版本](https://github.com/zadam/trilium/releases/latest)下载适用于您平台的二进制[版本](https://github.com/zadam/trilium/releases/latest),解压缩该软件包并运行`trilium`可执行文件。
* 如果要在服务器上安装Trilium,请遵循[此页面](https://github.com/zadam/trilium/wiki/Server-installation)。
* 当前仅支持(经过测试)最新的Chrome和Firefox浏览器。
## 文档
[有关文档页面的完整列表,请参见Wiki。](https://github.com/zadam/trilium/wiki/)
您还可以阅读[个人知识库模式](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base),以获取有关如何使用Trilium的灵感。
## 贡献
使用基于浏览器的开发环境
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/zadam/trilium)
或在本地克隆并运行
```
npm install
npm run start-server
```
## 致谢
* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - 市场上最好的所见即所得编辑器,互动性强且聆听能力强的团队
* [FancyTree](https://github.com/mar10/fancytree) - 一个非常丰富的关于树的库,强大的没有对手。没有它,Trilium Notes将不会如此。
* [CodeMirror](https://github.com/codemirror/CodeMirror) - 支持大量语言的代码编辑器
* [jsPlumb](https://github.com/jsplumb/jsplumb)强大的可视化连接库。- 用于[关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map)
+8 -2
View File
@@ -1,5 +1,7 @@
# Trilium Notes
[English](https://github.com/zadam/trilium/blob/master/README.md) | [Chinese](https://github.com/zadam/trilium/blob/master/README-ZH_CN.md) | [Russian](https://github.com/zadam/trilium/blob/master/README.ru.md)
[![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. See [screenshots](https://github.com/zadam/trilium/wiki/Screenshot-tour) for quick overview:
@@ -8,7 +10,7 @@ Trilium Notes is a hierarchical note taking application with focus on building l
## Features
* Notes can be arranged into arbitrarily deep tree. Single note can be placed into multiple places in the tree (see [cloning](https://github.com/zadam/trilium/wiki/Cloning-notes))
* Rich WYSIWYG note editing including e.g. tables and images with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-editor#autoformat)
* Rich WYSIWYG note editing including e.g. tables, images and [math](https://github.com/zadam/trilium/wiki/Text-notes#math-support) with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)
* Support for editing [notes with source code](https://github.com/zadam/trilium/wiki/Code-notes), including syntax highlighting
* Fast and easy [navigation between notes](https://github.com/zadam/trilium/wiki/Note-navigation), full text search and [note hoisting](https://github.com/zadam/trilium/wiki/Note-hoisting)
* Seamless [note versioning](https://github.com/zadam/trilium/wiki/Note-revisions)
@@ -54,4 +56,8 @@ npm run start-server
* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - best WYSIWYG editor on the market, very interactive and listening team
* [FancyTree](https://github.com/mar10/fancytree) - very feature rich tree library without real competition. Trilium Notes would not be the same without it.
* [CodeMirror](https://github.com/codemirror/CodeMirror) - code editor with support for huge amount of languages
* [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library without competition. Used in [relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map)
* [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library without competition. Used in [relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map)
## License
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+63
View File
@@ -0,0 +1,63 @@
# Trilium Notes
[English](https://github.com/zadam/trilium/blob/master/README.md) | [Chinese](https://github.com/zadam/trilium/blob/master/README-ZH_CN.md) | [Russian](https://github.com/zadam/trilium/blob/master/README.ru.md)
[![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Trilium Notes – это приложение для заметок с иерархической структурой, ориентированное на создание больших персональных баз знаний. Для быстрого ознакомления посмотрите [скриншот-тур](https://github.com/zadam/trilium/wiki/Screenshot-tour):
![](https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png)
## Возможности
* Заметки можно расположить в виде дерева произвольной глубины. Отдельную заметку можно разместить в нескольких местах дерева (см. [клонирование](https://github.com/zadam/trilium/wiki/Cloning-notes))
* Продвинутый визуальный редактор (WYSIWYG) позволяет работать с таблицами, изображениями, [формулами](https://github.com/zadam/trilium/wiki/Text-notes#math-support) и разметкой markdown, имеет [автоформатирование](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)
* Редактирование [заметок с исходным кодом](https://github.com/zadam/trilium/wiki/Code-notes), включая подсветку синтаксиса
* Быстрая и простая [навигация между заметками](https://github.com/zadam/trilium/wiki/Note-navigation), полнотекстовый поиск и [выделение заметок](https://github.com/zadam/trilium/wiki/Note-hoisting) в отдельный блок
* Бесшовное [версионирование заметки](https://github.com/zadam/trilium/wiki/Note-revisions)
* Специальные [атрибуты](https://github.com/zadam/trilium/wiki/Attributes) позволяют гибко организовать структуру, используются для поиска и продвинутого [скриптинга](https://github.com/zadam/trilium/wiki/Scripts)
* [Синхронизация](https://github.com/zadam/trilium/wiki/Synchronization) заметок со своим сервером
* Надёжное [шифрование](https://github.com/zadam/trilium/wiki/Protected-notes) с детализацией по каждой заметке
* [Карты связей](https://github.com/zadam/trilium/wiki/Relation-map) и [карты ссылок](https://github.com/zadam/trilium/wiki/Link-map) для визуализации их взяимосвязей
* [Скрипты](https://github.com/zadam/trilium/wiki/Scripts) - см. [продвинутые примеры](https://github.com/zadam/trilium/wiki/Advanced-showcases)
* Хорошо масштабируется, как по удобству использования, так и по производительности до 100000 заметок
* Оптимизированный [мобильный фронтенд](https://github.com/zadam/trilium/wiki/Mobile-frontend) смартфонов и планшетов
* [Темная тема](https://github.com/zadam/trilium/wiki/Themes)
* Импорт и экпорт [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import) и данных в [markdown](https://github.com/zadam/trilium/wiki/Markdown) формате
* [Web Clipper](https://github.com/zadam/trilium/wiki/Web-clipper) для удобного сохранения веб-контента
## Сборки
Trilium предоставляется в виде десктопного приложения (Linux и Windows) или веб-приложения, размещенного на вашем сервере (Linux). Доступна сборка Mac OS, но она [не поддерживается](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support).
* Если вы хотите использовать Trilium на десктопе, скачайте архив для своей платформы со страницы [релизов](https://github.com/zadam/trilium/releases/latest), распакуйте и запустите исполняемый файл ```trilium```.
* Если вы хотите установить Trilium на сервере, следуйте этой [инструкции](https://github.com/zadam/trilium/wiki/Server-installation).
* В данный момент поддерживаются (протестированы) последние версии браузеров Chrome и Firefox.
## Документация
[Полный список страниц документации доступен в Wiki.](https://github.com/zadam/trilium/wiki/)
Вы также можете ознакомиться с [шаблонами персональных баз знаний](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base), чтобы получить представление о том, как можно использовать Trilium.
## Участвуйте в разработке
Используйте онлайн среду разработки в браузере
[![Открыть в Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/zadam/trilium)
Или склонируйте на своё устройство и запустите
```
npm install
npm run start-server
```
## Благодарности
* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - лучший WYSIWYG редактор, очень активная и внимательная команда.
* [FancyTree](https://github.com/mar10/fancytree) - многофункциональная библиотека для создания древовидных структур. Вне конкуренции. Без него Trilium Notes не были бы таким.
* [CodeMirror](https://github.com/codemirror/CodeMirror) - редактор кода с поддержкой огромного количество языков.
* [jsPlumb](https://github.com/jsplumb/jsplumb) - библиотека для визуализации связей. Вне конкуренции. Используется в [картах связей](https://github.com/zadam/trilium/wiki/Relation-map) и [картах ссылок](https://github.com/zadam/trilium/wiki/Link-map).
## Лицензия
Эта программа является бесплатным программным обеспечением: вы можете распространять и/или изменять ее в соответствии с условиями GNU Affero General Public License, опубликованной Free Software Foundation, либо версии 3 Лицензии, либо (по вашему выбору) любой более поздней версии.
+13
View File
@@ -0,0 +1,13 @@
# Security Policy
## Supported Versions
In the (still active) 0.X phase of the project only the latest stable minor release is getting bugfixes (including security ones).
So e.g. if the latest stable version is 0.42.3 and the latest beta version is 0.43.0-beta, then 0.42 line will still get security fixes but older versions (like 0.41.X) won't get any fixes.
Description above is a general rule and may be altered on case by case basis.
## Reporting a Vulnerability
You can report low severity vulnerabilities as GitHub issues, more severe vulnerabilities should be reported to the email zadam.apps@gmail.com
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -5,7 +5,7 @@ SERIES=${VERSION:0:4}-latest
cat package.json | grep -v electron > server-package.json
sudo docker build -t zadam/trilium:$VERSION -t zadam/trilium:$SERIES .
sudo docker build -t zadam/trilium:$VERSION --network host -t zadam/trilium:$SERIES .
if [[ $VERSION != *"beta"* ]]; then
sudo docker tag zadam/trilium:$VERSION zadam/trilium:latest
+11 -7
View File
@@ -7,15 +7,13 @@ then
./bin/copy-trilium.sh $SRC_DIR
fi
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
echo "Copying required linux-x64 binaries"
rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
cp -r bin/better-sqlite3/linux-desktop-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
rm -r $SRC_DIR/src/public/dist/*.mobile.*
cp -r bin/deps/linux-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
cp bin/deps/linux-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
echo "Packaging linux x64 electron build"
./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
@@ -29,6 +27,12 @@ cp images/app-icons/png/128x128.png $BUILD_DIR/icon.png
# removing software WebGL binaries because they are pretty huge and not necessary
rm -r $BUILD_DIR/swiftshader
cp bin/tpl/trilium-portable.sh $BUILD_DIR/
chmod 755 $BUILD_DIR/trilium-portable.sh
cp bin/tpl/trilium-no-cert-check.sh $BUILD_DIR/
chmod 755 $BUILD_DIR/trilium-no-cert-check.sh
echo "Packaging linux x64 electron distribution..."
VERSION=`jq -r ".version" package.json`
@@ -38,4 +42,4 @@ tar cJf trilium-linux-x64-${VERSION}.tar.xz trilium-linux-x64
cd ..
bin/build-debian.sh
bin/build-debian.sh
+3 -9
View File
@@ -9,17 +9,11 @@ fi
echo "Copying required mac binaries"
rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
rm -r $SRC_DIR/node_modules/giflossy/vendor/*
cp -r bin/better-sqlite3/mac-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
cp -r bin/deps/mac-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
cp bin/deps/mac-x64/image/cjpeg $SRC_DIR/node_modules/mozjpeg/vendor/
cp bin/deps/mac-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
cp bin/deps/mac-x64/image/gifsicle $SRC_DIR/node_modules/giflossy/vendor/
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
rm -r $SRC_DIR/src/public/dist/*.mobile.*
echo "Packaging mac x64 electron build"
./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
+6 -5
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
PKG_DIR=dist/trilium-linux-x64-server
NODE_VERSION=12.16.2
NODE_VERSION=14.16.1
if [ "$1" != "DONTCOPY" ]
then
@@ -10,17 +10,18 @@ fi
cd dist
wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz
tar xvfJ node-v${NODE_VERSION}-linux-x64.tar.xz
tar xfJ node-v${NODE_VERSION}-linux-x64.tar.xz
rm node-v${NODE_VERSION}-linux-x64.tar.xz
cd ..
mv dist/node-v${NODE_VERSION}-linux-x64 $PKG_DIR/node
rm -r $PKG_DIR/node/lib/node_modules/npm
rm -r $PKG_DIR/node/include/node
rm -r $PKG_DIR/node_modules/electron*
rm -r $PKG_DIR/node_modules/sqlite3/lib/binding/*
cp -r ./bin/deps/linux-x64/sqlite/node* $PKG_DIR/node_modules/sqlite3/lib/binding/
cp -r bin/better-sqlite3/linux-server-better_sqlite3.node $PKG_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
printf "#!/bin/sh\n./node/bin/node src/www" > $PKG_DIR/trilium.sh
chmod 755 $PKG_DIR/trilium.sh
+6 -9
View File
@@ -9,17 +9,11 @@ fi
echo "Copying required windows binaries"
rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
rm -r $SRC_DIR/node_modules/giflossy/vendor/*
cp -r bin/better-sqlite3/win-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
cp -r bin/deps/win-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
cp bin/deps/win-x64/image/cjpeg.exe $SRC_DIR/node_modules/mozjpeg/vendor/
cp bin/deps/win-x64/image/pngquant.exe $SRC_DIR/node_modules/pngquant-bin/vendor/
cp bin/deps/win-x64/image/gifsicle.exe $SRC_DIR/node_modules/giflossy/vendor/
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
rm -r $SRC_DIR/src/public/dist/*.mobile.*
echo "Packaging windows x64 electron build"
./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=win32 --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico
@@ -31,6 +25,9 @@ mv "./dist/Trilium Notes-win32-x64" $BUILD_DIR
# removing software WebGL binaries because they are pretty huge and not necessary
rm -r $BUILD_DIR/swiftshader
cp bin/tpl/trilium-portable.bat $BUILD_DIR/
cp bin/tpl/trilium-no-cert-check.bat $BUILD_DIR/
echo "Zipping windows x64 electron distribution..."
VERSION=`jq -r ".version" package.json`
+18 -2
View File
@@ -5,6 +5,8 @@ if [[ $# -eq 0 ]] ; then
exit 1
fi
n exec 12 npm run webpack
DIR=$1
rm -rf $DIR
@@ -25,11 +27,25 @@ cp -r electron.js $DIR/
cp webpack-* $DIR/
# run in subshell (so we return to original dir)
(cd $DIR && npm install --only=prod && npm run webpack)
(cd $DIR && n exec 12 npm install --only=prod)
# cleanup of useless files in dependencies
rm -r $DIR/node_modules/image-q/demo
rm -r $DIR/node_modules/better-sqlite3/Release
rm -r $DIR/node_modules/better-sqlite3/deps/sqlite3.tar.gz
rm -r $DIR/node_modules/@jimp/plugin-print/fonts
rm -r $DIR/node_modules/jimp/browser
rm -r $DIR/node_modules/jimp/fonts
# delete all tests (there are often large images as test file for jimp etc.)
find $DIR/node_modules -name test -exec rm -rf {} \;
find $DIR/node_modules -name docs -exec rm -rf {} \;
find $DIR/node_modules -name demo -exec rm -rf {} \;
find $DIR/libraries -name "*.map" -type f -delete
rm -r $DIR/src/public/app
sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' $DIR/src/views/desktop.ejs
sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs
sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs
sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' $DIR/src/views/setup.ejs
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+3 -3
View File
@@ -8,9 +8,9 @@ fi
VERSION=$1
SERIES=${VERSION:0:4}-latest
sudo docker push zadam/trilium:$VERSION
sudo docker push zadam/trilium:$SERIES
docker push zadam/trilium:$VERSION
docker push zadam/trilium:$SERIES
if [[ $1 != *"beta"* ]]; then
sudo docker push zadam/trilium:latest
docker push zadam/trilium:latest
fi
+12 -39
View File
@@ -55,47 +55,20 @@ echo "Creating release in GitHub"
EXTRA=
if [[ $TAG == *"beta"* ]]; then
EXTRA=--pre-release
EXTRA=--prerelease
fi
github-release release \
--tag $TAG \
--name "$TAG release" $EXTRA
echo "$GITHUB_CLI_AUTH_TOKEN" | gh auth login --with-token
echo "Uploading debian x64 package"
github-release upload \
--tag $TAG \
--name "$DEBIAN_X64_BUILD" \
--file "dist/$DEBIAN_X64_BUILD"
echo "Uploading linux x64 build"
github-release upload \
--tag $TAG \
--name "$LINUX_X64_BUILD" \
--file "dist/$LINUX_X64_BUILD"
echo "Uploading windows x64 build"
github-release upload \
--tag $TAG \
--name "$WINDOWS_X64_BUILD" \
--file "dist/$WINDOWS_X64_BUILD"
echo "Uploading mac x64 build"
github-release upload \
--tag $TAG \
--name "$MAC_X64_BUILD" \
--file "dist/$MAC_X64_BUILD"
echo "Uploading linux x64 server build"
github-release upload \
--tag $TAG \
--name "$SERVER_BUILD" \
--file "dist/$SERVER_BUILD"
gh release create "$TAG" \
--title "$TAG release" \
--notes "" \
$EXTRA \
"dist/$DEBIAN_X64_BUILD" \
"dist/$LINUX_X64_BUILD" \
"dist/$WINDOWS_X64_BUILD" \
"dist/$MAC_X64_BUILD" \
"dist/$SERVER_BUILD"
echo "Building docker image"
@@ -105,4 +78,4 @@ echo "Pushing docker image to dockerhub"
bin/push-docker-image.sh $VERSION
echo "Release finished!"
echo "Release finished!"
+4
View File
@@ -0,0 +1,4 @@
SET DIR=%~dp0
set NODE_TLS_REJECT_UNAUTHORIZED=0
cd %DIR%
start trilium.exe
+7
View File
@@ -0,0 +1,7 @@
#!/usr/bin/env sh
DIR=`dirname "$0"`
export NODE_TLS_REJECT_UNAUTHORIZED=0
"$DIR/trilium"
+4
View File
@@ -0,0 +1,4 @@
SET DIR=%~dp0
SET TRILIUM_DATA_DIR=%DIR%\trilium-data
cd %DIR%
start trilium.exe
+7
View File
@@ -0,0 +1,7 @@
#!/usr/bin/env sh
DIR=`dirname "$0"`
export TRILIUM_DATA_DIR="$DIR/trilium-data"
"$DIR/trilium"
+7 -1
View File
@@ -1,7 +1,13 @@
[General]
# Instance name can be used to distinguish between different instances
# Instance name can be used to distinguish between different instances using backend api.getInstanceName()
instanceName=
# set to true to allow using Trilium without authentication (makes sense for server build only, desktop build doesn't need password)
noAuthentication=false
# set to true to disable backups (e.g. because of limited space on server)
noBackup=false
# Disable automatically generating desktop icon
# noDesktopIcon=true
BIN
View File
Binary file not shown.
-11
View File
@@ -1,11 +0,0 @@
DROP TABLE IF EXISTS anchors;
DROP TABLE IF EXISTS attachments;
DROP TABLE IF EXISTS bookmarks;
DROP TABLE IF EXISTS custom_properties;
DROP TABLE IF EXISTS deletions;
DROP TABLE IF EXISTS deletions_attachments;
DROP TABLE IF EXISTS formatting;
DROP TABLE IF EXISTS icons;
DROP TABLE IF EXISTS tags;
DROP TABLE IF EXISTS tags_notes;
DROP TABLE IF EXISTS tasks;
@@ -1,3 +0,0 @@
CREATE TABLE notes_mig AS SELECT note_id, note_title, note_text, note_clone_id, date_created, date_modified, encryption FROM notes;
DROP TABLE notes;
ALTER TABLE notes_mig RENAME TO notes;
@@ -1 +0,0 @@
ALTER TABLE notes ADD COLUMN is_deleted INTEGER NOT NULL DEFAULT 0
@@ -1 +0,0 @@
ALTER TABLE notes_tree ADD COLUMN date_modified INTEGER NOT NULL DEFAULT 0
-1
View File
@@ -1 +0,0 @@
DELETE FROM options WHERE opt_name IN ('is_readonly', 'prop_modified', 'doc_title', 'doc_UID', 'format_version', 'flask_secret_key')
@@ -1,3 +0,0 @@
CREATE TABLE notes_history_mig AS SELECT id, note_id, note_title, note_text, date_modified AS date_modified_from, date_modified AS date_modified_to FROM notes_history;
DROP TABLE notes_history;
ALTER TABLE notes_history_mig RENAME TO notes_history;
@@ -1 +0,0 @@
ALTER TABLE notes_history ADD COLUMN encryption INTEGER DEFAULT 0
-15
View File
@@ -1,15 +0,0 @@
CREATE TABLE `notes_history_mig` (
`id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
`note_id` INT,
`note_title` TEXT,
`note_text` TEXT,
`date_modified_from` INT,
`date_modified_to` INT,
`encryption` INTEGER DEFAULT 0
);
INSERT INTO notes_history (id, note_id, note_title, note_text, date_modified_from, date_modified_to, encryption)
SELECT id, note_id, note_title, note_text, date_modified_from, date_modified_to, encryption FROM notes_history;
DROP TABLE notes_history;
ALTER TABLE notes_history_mig RENAME TO notes_history;
-41
View File
@@ -1,41 +0,0 @@
CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
`note_id`
);
CREATE INDEX `IDX_images_note_id` ON `images` (
`note_id`
);
CREATE INDEX `IDX_links_note_id` ON `links` (
`note_id`
);
CREATE INDEX `IDX_audit_log_note_id` ON `audit_log` (
`note_id`
);
CREATE INDEX `IDX_audit_log_date_modified` ON `audit_log` (
`date_modified`
);
CREATE TABLE `notes_mig` (
`note_id` TEXT NOT NULL,
`note_title` TEXT,
`note_text` TEXT,
`note_clone_id` TEXT,
`date_created` INT,
`date_modified` INT,
`encryption` INT,
`is_deleted` INTEGER NOT NULL DEFAULT 0,
PRIMARY KEY(`note_id`)
);
INSERT INTO notes_mig (note_id, note_title, note_text, note_clone_id, date_created, date_modified, encryption)
SELECT note_id, note_title, note_text, note_clone_id, date_created, date_modified, encryption FROM notes;
DROP TABLE notes;
ALTER TABLE notes_mig RENAME TO notes;
CREATE INDEX `IDX_notes_is_deleted` ON `notes` (
`is_deleted`
);
@@ -1,5 +0,0 @@
ALTER TABLE notes_tree ADD COLUMN is_deleted INTEGER NOT NULL DEFAULT 0;
CREATE INDEX `IDX_notes_tree_is_deleted` ON `notes_tree` (
`is_deleted`
);
@@ -1 +0,0 @@
INSERT INTO options (opt_name, opt_value) VALUES ('last_synced', 0)
@@ -1,5 +0,0 @@
CREATE UNIQUE INDEX `IDX_notes_history_note_from_to` ON `notes_history` (
`note_id`,
`date_modified_from`,
`date_modified_to`
);
@@ -1,3 +0,0 @@
UPDATE options SET opt_name = 'last_synced_pull' WHERE opt_name = 'last_synced';
INSERT INTO options (opt_name, opt_value) VALUES ('last_synced_push', 0);
@@ -1,16 +0,0 @@
CREATE TABLE `audit_log_mig` (
`id` TEXT NOT NULL PRIMARY KEY,
`date_modified` INTEGER NOT NULL,
`category` TEXT NOT NULL,
`browser_id` TEXT,
`note_id` TEXT,
`change_from` TEXT,
`change_to` TEXT,
`comment` TEXT
);
INSERT INTO audit_log_mig (id, date_modified, category, browser_id, note_id, change_from, change_to)
SELECT id, date_modified, category, browser_id, note_id, change_from, change_to FROM audit_log;
DROP TABLE audit_log;
ALTER TABLE audit_log_mig RENAME TO audit_log;
-6
View File
@@ -1,6 +0,0 @@
UPDATE notes SET note_id = substr(note_id, 0, 22);
UPDATE notes_tree SET note_id = substr(note_id, 0, 22), note_pid = substr(note_pid, 0, 22);
UPDATE notes_history SET note_id = substr(note_id, 0, 22);
UPDATE audit_log SET note_id = substr(note_id, 0, 22);
UPDATE links SET note_id = substr(note_id, 0, 22);
UPDATE images SET note_id = substr(note_id, 0, 22);
-6
View File
@@ -1,6 +0,0 @@
UPDATE notes SET note_id = substr(note_id, 0, 13);
UPDATE notes_tree SET note_id = substr(note_id, 0, 13), note_pid = substr(note_pid, 0, 13);
UPDATE notes_history SET note_id = substr(note_id, 0, 13);
UPDATE audit_log SET note_id = substr(note_id, 0, 13);
UPDATE links SET note_id = substr(note_id, 0, 13);
UPDATE images SET note_id = substr(note_id, 0, 13);
-1
View File
@@ -1 +0,0 @@
INSERT INTO options (opt_name, opt_value) VALUES ('document_id', '');
-1
View File
@@ -1 +0,0 @@
INSERT INTO options (opt_name, opt_value) VALUES ('document_secret', '');
@@ -1 +0,0 @@
ALTER TABLE options ADD COLUMN date_modified INTEGER NOT NULL DEFAULT 0
-15
View File
@@ -1,15 +0,0 @@
CREATE TABLE `sync` (
`id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
`entity_name` TEXT NOT NULL,
`entity_id` TEXT NOT NULL,
`sync_date` INTEGER NOT NULL
);
CREATE UNIQUE INDEX `IDX_sync_entity_name_id` ON `sync` (
`entity_name`,
`entity_id`
);
CREATE INDEX `IDX_sync_sync_date` ON `sync` (
`sync_date`
);
@@ -1 +0,0 @@
ALTER TABLE sync ADD COLUMN source_id TEXT
@@ -1,7 +0,0 @@
ALTER TABLE notes_history ADD COLUMN note_history_id TEXT;
UPDATE notes_history SET note_history_id = id;
CREATE UNIQUE INDEX `IDX_note_history_note_history_id` ON `notes_history` (
`note_history_id`
);
@@ -1,27 +0,0 @@
CREATE TABLE `notes_history_mig` (
`note_history_id` TEXT NOT NULL PRIMARY KEY,
`note_id` TEXT NOT NULL,
`note_title` TEXT,
`note_text` TEXT,
`encryption` INT,
`date_modified_from` INT,
`date_modified_to` INT
);
INSERT INTO notes_history_mig (note_history_id, note_id, note_title, note_text, encryption, date_modified_from, date_modified_to)
SELECT note_history_id, note_id, note_title, note_text, encryption, date_modified_from, date_modified_to FROM notes_history;
DROP TABLE notes_history;
ALTER TABLE notes_history_mig RENAME TO notes_history;
CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
`note_id`
);
CREATE INDEX `IDX_notes_history_note_date_modified_from` ON `notes_history` (
`date_modified_from`
);
CREATE INDEX `IDX_notes_history_note_date_modified_to` ON `notes_history` (
`date_modified_to`
);
@@ -1,11 +0,0 @@
CREATE TABLE `options_mig` (
`opt_name` TEXT NOT NULL PRIMARY KEY,
`opt_value` TEXT,
`date_modified` INT
);
INSERT INTO options_mig (opt_name, opt_value, date_modified)
SELECT opt_name, opt_value, date_modified FROM options;
DROP TABLE options;
ALTER TABLE options_mig RENAME TO options;
-10
View File
@@ -1,10 +0,0 @@
CREATE TABLE `event_log` (
`id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
`note_id` TEXT,
`comment` TEXT,
`date_added` INTEGER NOT NULL
);
CREATE INDEX `IDX_event_log_date_added` ON `event_log` (
`date_added`
);
@@ -1,4 +0,0 @@
CREATE TABLE `recent_notes` (
`note_id` TEXT NOT NULL PRIMARY KEY,
`date_accessed` INTEGER NOT NULL
);
@@ -1 +0,0 @@
ALTER TABLE recent_notes ADD COLUMN is_deleted INT;
@@ -1,52 +0,0 @@
UPDATE audit_log SET category = 'PROTECTED' WHERE category = 'ENCRYPTION';
DELETE FROM notes WHERE note_clone_id IS NOT NULL AND note_clone_id != '';
CREATE TABLE `notes_mig` (
`note_id` TEXT NOT NULL,
`note_title` TEXT,
`note_text` TEXT,
`date_created` INT,
`date_modified` INT,
`is_protected` INT NOT NULL DEFAULT 0,
`is_deleted` INT NOT NULL DEFAULT 0,
PRIMARY KEY(`note_id`)
);
INSERT INTO notes_mig (note_id, note_title, note_text, date_created, date_modified, is_protected, is_deleted)
SELECT note_id, note_title, note_text, date_created, date_modified, encryption, is_deleted FROM notes;
DROP TABLE notes;
ALTER TABLE notes_mig RENAME TO notes;
CREATE INDEX `IDX_notes_is_deleted` ON `notes` (
`is_deleted`
);
CREATE TABLE `notes_history_mig` (
`note_history_id` TEXT NOT NULL PRIMARY KEY,
`note_id` TEXT NOT NULL,
`note_title` TEXT,
`note_text` TEXT,
`is_protected` INT,
`date_modified_from` INT,
`date_modified_to` INT
);
INSERT INTO notes_history_mig (note_history_id, note_id, note_title, note_text, is_protected, date_modified_from, date_modified_to)
SELECT note_history_id, note_id, note_title, note_text, encryption, date_modified_from, date_modified_to FROM notes_history;
DROP TABLE notes_history;
ALTER TABLE notes_history_mig RENAME TO notes_history;
CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
`note_id`
);
CREATE INDEX `IDX_notes_history_note_date_modified_from` ON `notes_history` (
`date_modified_from`
);
CREATE INDEX `IDX_notes_history_note_date_modified_to` ON `notes_history` (
`date_modified_to`
);
@@ -1 +0,0 @@
UPDATE options SET opt_name = 'protected_session_timeout' WHERE opt_name = 'encryption_session_timeout';
-1
View File
@@ -1 +0,0 @@
module.exports = async () => console.log("heeeelllooo!!!");
@@ -1,44 +0,0 @@
const sql = require('../services/sql');
const data_encryption = require('../services/data_encryption');
const password_encryption = require('../services/password_encryption');
const readline = require('readline');
const cl = readline.createInterface(process.stdin, process.stdout);
function question(q) {
return new Promise( (res, rej) => {
cl.question( q, answer => {
res(answer);
})
});
}
module.exports = async () => {
const password = await question("Enter password: ");
const dataKey = await password_encryption.getDecryptedDataKey(password);
const protectedNotes = await sql.getRows("SELECT * FROM notes WHERE is_protected = 1");
for (const note of protectedNotes) {
const decryptedTitle = data_encryption.decrypt(dataKey, note.note_title);
note.note_title = data_encryption.encrypt(dataKey, "0" + note.note_id, decryptedTitle);
const decryptedText = data_encryption.decrypt(dataKey, note.note_text);
note.note_text = data_encryption.encrypt(dataKey, "1" + note.note_id, decryptedText);
await sql.execute("UPDATE notes SET note_title = ?, note_text = ? WHERE note_id = ?", [note.note_title, note.note_text, note.note_id]);
}
const protectedNotesHistory = await sql.getRows("SELECT * FROM notes_history WHERE is_protected = 1");
for (const noteHistory of protectedNotesHistory) {
const decryptedTitle = data_encryption.decrypt(dataKey, noteHistory.note_title);
noteHistory.note_title = data_encryption.encrypt(dataKey, "0" + noteHistory.note_history_id, decryptedTitle);
const decryptedText = data_encryption.decrypt(dataKey, noteHistory.note_text);
noteHistory.note_text = data_encryption.encrypt(dataKey, "1" + noteHistory.note_history_id, decryptedText);
await sql.execute("UPDATE notes SET note_title = ?, note_text = ? WHERE note_id = ?", [noteHistory.note_title, noteHistory.note_text, noteHistory.note_history_id]);
}
};
@@ -1 +0,0 @@
INSERT INTO options (opt_name, opt_value) VALUES ('encrypted_data_key_iv', '')
@@ -1,25 +0,0 @@
const password_encryption = require('../services/password_encryption');
const readline = require('readline');
const cl = readline.createInterface(process.stdin, process.stdout);
function question(q) {
return new Promise( (res, rej) => {
cl.question( q, answer => {
res(answer);
})
});
}
module.exports = async () => {
const password = await question("Enter password: ");
let dataKey = await password_encryption.getDecryptedDataKey(password);
console.log("Original data key: ", dataKey);
dataKey = dataKey.slice(0, 16);
console.log("Trimmed data key: ", dataKey);
await password_encryption.setDataKey(password, dataKey);
};
-5
View File
@@ -1,5 +0,0 @@
CREATE TABLE `source_ids` (
`source_id` TEXT NOT NULL,
`date_created` INTEGER NOT NULL,
PRIMARY KEY(`source_id`)
);
@@ -1 +0,0 @@
UPDATE notes_tree SET note_pid = 'root' WHERE note_pid = ''
-1
View File
@@ -1 +0,0 @@
DELETE FROM sync;
-21
View File
@@ -1,21 +0,0 @@
CREATE TABLE [notes_tree_mig] (
[note_tree_id] VARCHAR(30) PRIMARY KEY NOT NULL,
[note_id] VARCHAR(30) UNIQUE NOT NULL,
[note_pid] VARCHAR(30) NOT NULL,
[note_pos] INTEGER NOT NULL,
[is_expanded] BOOLEAN NULL ,
date_modified INTEGER NOT NULL DEFAULT 0,
is_deleted INTEGER NOT NULL DEFAULT 0
);
INSERT INTO notes_tree_mig (note_tree_id, note_id, note_pid, note_pos, is_expanded, date_modified, is_deleted)
SELECT 'TT' || SUBSTR(note_id, 3), note_id, note_pid, note_pos, is_expanded, date_modified, is_deleted FROM notes_tree;
UPDATE notes_tree_mig SET note_pid = 'TT' || SUBSTR(note_pid, 3) WHERE note_pid != 'root';
DROP TABLE notes_tree;
ALTER TABLE notes_tree_mig RENAME TO notes_tree;
CREATE INDEX `IDX_notes_tree_note_id` ON `notes_tree` (
`note_tree_id`
);
@@ -1 +0,0 @@
UPDATE options SET opt_name = 'start_note_tree_id' WHERE opt_name = 'start_node';
@@ -1,7 +0,0 @@
DROP TABLE recent_notes;
CREATE TABLE `recent_notes` (
`note_tree_id` TEXT NOT NULL PRIMARY KEY,
`date_accessed` INTEGER NOT NULL ,
is_deleted INT
);
-6
View File
@@ -1,6 +0,0 @@
UPDATE
notes_tree
SET
note_pid = (SELECT parent.note_id FROM notes_tree parent WHERE notes_tree.note_pid = parent.note_tree_id)
WHERE
note_pid != 'root'
@@ -1,7 +0,0 @@
DROP TABLE recent_notes;
CREATE TABLE `recent_notes` (
`note_path` TEXT NOT NULL PRIMARY KEY,
`date_accessed` INTEGER NOT NULL ,
is_deleted INT
);
@@ -1,24 +0,0 @@
CREATE TABLE "notes_tree_mig" (
[note_tree_id] VARCHAR(30) PRIMARY KEY NOT NULL,
[note_id] VARCHAR(30) NOT NULL,
[note_pid] VARCHAR(30) NOT NULL,
[note_pos] INTEGER NOT NULL,
[is_expanded] BOOLEAN NULL ,
date_modified INTEGER NOT NULL DEFAULT 0,
is_deleted INTEGER NOT NULL DEFAULT 0
);
INSERT INTO notes_tree_mig (note_tree_id, note_id, note_pid, note_pos, is_expanded, date_modified, is_deleted)
SELECT note_tree_id, note_id, note_pid, note_pos, is_expanded, date_modified, is_deleted FROM notes_tree;
DROP TABLE notes_tree;
ALTER TABLE notes_tree_mig RENAME TO notes_tree;
CREATE INDEX `IDX_notes_tree_note_tree_id` ON `notes_tree` (
`note_tree_id`
);
CREATE INDEX `IDX_notes_tree_note_id_note_pid` ON `notes_tree` (
`note_id`,
`note_pid`
);
-3
View File
@@ -1,3 +0,0 @@
DELETE FROM sync;
UPDATE options SET opt_value = 0 WHERE opt_name IN ('last_synced_push', 'last_synced_pull');
-1
View File
@@ -1 +0,0 @@
DROP TABLE audit_log;
@@ -1 +0,0 @@
ALTER TABLE notes_tree ADD COLUMN `prefix` TEXT
@@ -1,2 +0,0 @@
DROP TABLE IF EXISTS links;
DROP TABLE IF EXISTS images;
-1
View File
@@ -1 +0,0 @@
SELECT 1;
@@ -1,10 +0,0 @@
DROP TABLE recent_notes;
CREATE TABLE `recent_notes` (
'note_tree_id'TEXT NOT NULL PRIMARY KEY,
`note_path` TEXT NOT NULL,
`date_accessed` INTEGER NOT NULL ,
is_deleted INT
);
DELETE FROM sync WHERE entity_name = 'recent_notes';
@@ -1 +0,0 @@
UPDATE options SET opt_name = 'start_note_path' WHERE opt_name = 'start_note_tree_id';
-156
View File
@@ -1,156 +0,0 @@
DROP TABLE migrations;
-- Sync
CREATE TABLE `sync_mig` (
`id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
`entity_name` TEXT NOT NULL,
`entity_id` TEXT NOT NULL,
`source_id` TEXT NOT NULL,
`sync_date` TEXT NOT NULL);
INSERT INTO sync_mig (id, entity_name, entity_id, source_id, sync_date)
SELECT id, entity_name, entity_id, source_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', sync_date, 'unixepoch') FROM sync;
DROP TABLE sync;
ALTER TABLE sync_mig RENAME TO sync;
CREATE UNIQUE INDEX `IDX_sync_entity_name_id` ON `sync` (
`entity_name`,
`entity_id`
);
CREATE INDEX `IDX_sync_sync_date` ON `sync` (
`sync_date`
);
-- Options
UPDATE options SET opt_value = strftime('%Y-%m-%dT%H:%M:%S.000Z', opt_value, 'unixepoch') WHERE opt_name IN ('last_backup_date');
UPDATE options SET date_modified = strftime('%Y-%m-%dT%H:%M:%S.000Z', date_modified, 'unixepoch');
-- Event log
CREATE TABLE `event_log_mig` (
`id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
`note_id` TEXT,
`comment` TEXT,
`date_added` TEXT NOT NULL
);
INSERT INTO event_log_mig (id, note_id, comment, date_added)
SELECT id, note_id, comment, strftime('%Y-%m-%dT%H:%M:%S.000Z', date_added, 'unixepoch') FROM event_log;
DROP TABLE event_log;
ALTER TABLE event_log_mig RENAME TO event_log;
CREATE INDEX `IDX_event_log_date_added` ON `event_log` (
`date_added`
);
-- Notes
CREATE TABLE IF NOT EXISTS "notes_mig" (
`note_id` TEXT NOT NULL,
`note_title` TEXT,
`note_text` TEXT,
`is_protected` INT NOT NULL DEFAULT 0,
`is_deleted` INT NOT NULL DEFAULT 0,
`date_created` TEXT NOT NULL,
`date_modified` TEXT NOT NULL,
PRIMARY KEY(`note_id`)
);
INSERT INTO notes_mig (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified)
SELECT note_id, note_title, note_text, is_protected, is_deleted,
strftime('%Y-%m-%dT%H:%M:%S.000Z', date_created, 'unixepoch'),
strftime('%Y-%m-%dT%H:%M:%S.000Z', date_modified, 'unixepoch')
FROM notes;
DROP TABLE notes;
ALTER TABLE notes_mig RENAME TO notes;
CREATE INDEX `IDX_notes_is_deleted` ON `notes` (
`is_deleted`
);
-- note history
CREATE TABLE IF NOT EXISTS "notes_history_mig" (
`note_history_id` TEXT NOT NULL PRIMARY KEY,
`note_id` TEXT NOT NULL,
`note_title` TEXT,
`note_text` TEXT,
`is_protected` INT NOT NULL DEFAULT 0,
`date_modified_from` TEXT NOT NULL,
`date_modified_to` TEXT NOT NULL
);
INSERT INTO notes_history_mig (note_history_id, note_id, note_title, note_text, is_protected, date_modified_from, date_modified_to)
SELECT note_history_id, note_id, note_title, note_text, is_protected,
strftime('%Y-%m-%dT%H:%M:%S.000Z', date_modified_from, 'unixepoch'),
strftime('%Y-%m-%dT%H:%M:%S.000Z', date_modified_to, 'unixepoch')
FROM notes_history;
DROP TABLE notes_history;
ALTER TABLE notes_history_mig RENAME TO notes_history;
CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
`note_id`
);
CREATE INDEX `IDX_notes_history_note_date_modified_from` ON `notes_history` (
`date_modified_from`
);
CREATE INDEX `IDX_notes_history_note_date_modified_to` ON `notes_history` (
`date_modified_to`
);
-- Source IDs
DROP TABLE source_ids;
CREATE TABLE `source_ids` (
`source_id` TEXT NOT NULL,
`date_created` TEXT NOT NULL,
PRIMARY KEY(`source_id`)
);
-- Recent notes
DROP TABLE recent_notes;
CREATE TABLE `recent_notes` (
`note_tree_id` TEXT NOT NULL PRIMARY KEY,
`note_path` TEXT NOT NULL,
`date_accessed` TEXT NOT NULL,
is_deleted INT
);
-- Notes tree
CREATE TABLE IF NOT EXISTS "notes_tree_mig" (
`note_tree_id` TEXT NOT NULL,
`note_id` TEXT NOT NULL,
`note_pid` TEXT NOT NULL,
`note_pos` INTEGER NOT NULL,
`prefix` TEXT,
`is_expanded` BOOLEAN,
`is_deleted` INTEGER NOT NULL DEFAULT 0,
`date_modified` TEXT NOT NULL,
PRIMARY KEY(`note_tree_id`)
);
INSERT INTO notes_tree_mig (note_tree_id, note_id, note_pid, note_pos, prefix, is_expanded, is_deleted, date_modified)
SELECT note_tree_id, note_id, note_pid, note_pos, prefix, is_expanded, is_deleted,
strftime('%Y-%m-%dT%H:%M:%S.000Z', date_modified, 'unixepoch')
FROM notes_tree;
DROP TABLE notes_tree;
ALTER TABLE notes_tree_mig RENAME TO notes_tree;
CREATE INDEX `IDX_notes_tree_note_tree_id` ON `notes_tree` (
`note_tree_id`
);
CREATE INDEX `IDX_notes_tree_note_id_note_pid` ON `notes_tree` (
`note_id`,
`note_pid`
);
@@ -1,5 +0,0 @@
DROP index IDX_notes_tree_note_tree_id;
CREATE INDEX `IDX_notes_tree_note_id` ON `notes_tree` (
`note_id`
);
-8
View File
@@ -1,8 +0,0 @@
INSERT OR IGNORE INTO sync (entity_name, entity_id, sync_date, source_id)
SELECT 'notes', note_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), 'IMPORT' FROM notes;
INSERT OR IGNORE INTO sync (entity_name, entity_id, sync_date, source_id)
SELECT 'notes_tree', note_tree_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), 'IMPORT' FROM notes_tree;
INSERT OR IGNORE INTO sync (entity_name, entity_id, sync_date, source_id)
SELECT 'notes_history', note_history_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), 'IMPORT' FROM notes_history;
@@ -1,18 +0,0 @@
delete from notes where note_id in ('FfZylYxt','HqzAEsR2fFEZ','KgTQDh67+1Mh','TKMbAYl0AFyQ','W+bGM185c6gw',
'YXBdhv4dYKMy','aF4/6p1zTpIS','nsLnrrDktl/s','wkhFImoPuxky');
delete from notes_tree where note_tree_id in ('TTy5N2y2S6JP','TTkL3rWDexpp','TTEhtomZekUk','TTvP7zW01zwg','TTuYmMTZyKRt'
,'TToaClamxbBF','TTKvNCe5X2dj','TTE7jFx5A0zW','TTc79bscyrHX','TTcw8ZyDy2Cc','TTdFzAOWA9hZ','TTUyVLqyIvVg','TTy85NKSBDyO'
,'TTCyuireAWBv','TTDpVyuzbj1a','TTYznrYvAeIs','TTocvv15VMyu','TTjtxQkBT5vj','TToyyRzbBF0T','TTFt8NE9vSyZ','TTfzFZOuuDqv'
,'TT2e2oUYcxG6','TToXselUpPAy','TTEM68gGukg0','TTkZxxwtUOzW','TTAZNxBtgmmh','TTK1YErdBE3x','TTzjKiEf54o6','TTPWd5Ou1xET'
,'TTxQtjf22rTL','TTJAGaI4c89V','TTUQmsxSTdV3','TTGAOf5Lvr6b','TTECSDRN4ZPW','TTZZXLiGNWv4','TTxSLphulRct','TT8vld7x0qWF'
,'TTuuxXnv2Kpw','TT3RkLZ9AI6t','TTuEbI4Cj3qC','TT4CXXRyWRqm','TTQCuFgnMqxX','TTxnDEMz1bd4','TTMOnqhBesjs','TTHblx55gRHN'
,'TTMHW8HIGCjR','TTxzg3qqyLjw','TTluvD7yS8Rv','TT88qK2j3ggk','TTF7oHhS5ANF','TTOH275JiUSy','TToIt2dQ5tYH','TTBPgixQgbAq'
,'TTeN46707CJl','TTDb3GC2y6nN','TTlIXFwpICko','TTE6M9AxLh2U','TTjqhB8zXjD6','TT9NPeLg4FjK','TTj12jDX7TM3','TTPRjf7EdvDX'
,'TTBnu09pxOmn','TTZxyAkJQ9Cf','TTlvqeof2IBS','TT5R5xtIqRQf','TTiiD6hFjlVH','TTNVjGHSqNgo','TTrORSHCsAVQ','TT5Ei5fngqkv'
,'TTQ4hdpcIX3C','TTQgxq4CoiHU','TTJayLjI6BSE','TTYyraNy0CVT','TTnAJ3AK3wHz','TTJwKcgs1s0X','TT4FiatgbLEs','TTEdp5Zx1n5F');
update notes_tree set is_deleted = 1 where note_tree_id in ('TTiaU9xqnrca','TTQAy9c1vDId','TTHXWBJB2Y24','TTDV8DUK2IZA'
,'TTI5JHODZYV5','TTBEZ8TMSJV4','TT1MDWZXE8ZI','TTJV7ZOA8907','TTUGE6N99QSO','TTN0OS17T0KM');
delete from notes_history where note_history_id in ('KHAp5viTrrOfugzQ', 'xmhaS76piZn0QGzn', '25aL96ke8xmud9Bt');
@@ -1,3 +0,0 @@
DELETE FROM notes_tree WHERE note_tree_id IN ('cb94QGgnCwOD', 'c3FWKhcVYyaQ');
DELETE FROM notes_history WHERE note_history_id IN ('cdUD6ycs3l9h', 'OW4uh0HLtXaw');
@@ -1 +0,0 @@
UPDATE options SET opt_value = (SELECT MAX(id) FROM sync) WHERE opt_name = 'last_synced_push';
-13
View File
@@ -1,13 +0,0 @@
DELETE FROM recent_notes;
DELETE FROM sync;
INSERT OR IGNORE INTO sync (entity_name, entity_id, sync_date, source_id)
SELECT 'notes', note_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), 'IMPORT' FROM notes;
INSERT OR IGNORE INTO sync (entity_name, entity_id, sync_date, source_id)
SELECT 'notes_tree', note_tree_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), 'IMPORT' FROM notes_tree;
INSERT OR IGNORE INTO sync (entity_name, entity_id, sync_date, source_id)
SELECT 'notes_history', note_history_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), 'IMPORT' FROM notes_history;
UPDATE options SET opt_value = (SELECT MAX(id) FROM sync) WHERE opt_name IN ('last_synced_push', 'last_synced_pull');
-101
View File
@@ -1,101 +0,0 @@
INSERT INTO notes (note_id, note_title, note_text, date_created, date_modified)
VALUES ('root', 'root', 'root', strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'));
CREATE TABLE IF NOT EXISTS "notes_mig" (
`note_id` TEXT NOT NULL,
`note_title` TEXT,
`note_text` TEXT,
`is_protected` INT NOT NULL DEFAULT 0,
`is_deleted` INT NOT NULL DEFAULT 0,
`date_created` TEXT NOT NULL,
`date_modified` TEXT NOT NULL,
PRIMARY KEY(`note_id`)
);
INSERT INTO notes_mig (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified)
SELECT note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified FROM notes;
DROP TABLE notes;
ALTER TABLE notes_mig RENAME TO notes;
CREATE INDEX `IDX_notes_is_deleted` ON `notes` (
`is_deleted`
);
CREATE TABLE IF NOT EXISTS "notes_tree_mig" (
`note_tree_id` TEXT NOT NULL,
`note_id` TEXT NOT NULL,
`parent_note_id` TEXT NOT NULL,
`note_position` INTEGER NOT NULL,
`prefix` TEXT,
`is_expanded` BOOLEAN,
`is_deleted` INTEGER NOT NULL DEFAULT 0,
`date_modified` TEXT NOT NULL,
FOREIGN KEY(note_id) REFERENCES notes(note_id),
FOREIGN KEY(parent_note_id) REFERENCES notes(note_id),
PRIMARY KEY(`note_tree_id`)
);
INSERT INTO notes_tree_mig (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified)
SELECT note_tree_id, note_id, note_pid, note_pos, prefix, is_expanded, is_deleted, date_modified FROM notes_tree;
DROP TABLE notes_tree;
ALTER TABLE notes_tree_mig RENAME TO notes_tree;
CREATE INDEX `IDX_notes_tree_note_tree_id` ON `notes_tree` (
`note_tree_id`
);
CREATE INDEX `IDX_notes_tree_note_id_parent_note_id` ON `notes_tree` (
`note_id`,
`parent_note_id`
);
CREATE INDEX `IDX_notes_tree_note_id` ON `notes_tree` (
`note_id`
);
CREATE TABLE IF NOT EXISTS "notes_history_mig" (
`note_history_id` TEXT NOT NULL PRIMARY KEY,
`note_id` TEXT NOT NULL,
`note_title` TEXT,
`note_text` TEXT,
`is_protected` INT NOT NULL DEFAULT 0,
`date_modified_from` TEXT NOT NULL,
`date_modified_to` TEXT NOT NULL,
FOREIGN KEY(note_id) REFERENCES notes(note_id)
);
INSERT INTO notes_history_mig (note_history_id, note_id, note_title, note_text, is_protected, date_modified_from, date_modified_to)
SELECT note_history_id, note_id, note_title, note_text, is_protected, date_modified_from, date_modified_to FROM notes_history;
DROP TABLE notes_history;
ALTER TABLE notes_history_mig RENAME TO notes_history;
CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
`note_id`
);
CREATE INDEX `IDX_notes_history_note_date_modified_from` ON `notes_history` (
`date_modified_from`
);
CREATE INDEX `IDX_notes_history_note_date_modified_to` ON `notes_history` (
`date_modified_to`
);
DROP TABLE recent_notes;
CREATE TABLE `recent_notes` (
`note_tree_id` TEXT NOT NULL PRIMARY KEY,
`note_path` TEXT NOT NULL,
`date_accessed` TEXT NOT NULL,
is_deleted INT,
FOREIGN KEY(note_tree_id) REFERENCES notes_tree(note_tree_id)
);
DROP TABLE event_log;
CREATE TABLE `event_log` (
`id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
`note_id` TEXT,
`comment` TEXT,
`date_added` TEXT NOT NULL,
FOREIGN KEY(note_id) REFERENCES notes(note_id)
);

Some files were not shown because too many files have changed in this diff Show More