Compare commits

...

609 Commits

Author SHA1 Message Date
zadam
21d2ca3c54 release 0.48.1-beta 2021-10-12 22:42:48 +02:00
zadam
64a3a8b561 tweaks 2021-10-12 22:36:22 +02:00
zadam
6738f2cd24 fix preserving original sourceId after running script notes, fixes #2224 2021-10-12 21:41:25 +02:00
zadam
1cdd644b8f fix reloading frontend after erasing notes in firefox, fixes #2221 2021-10-12 19:47:44 +02:00
zadam
f5dc05e79a Merge remote-tracking branch 'origin/master' 2021-10-12 19:30:42 +02:00
zadam
e2c37a6f8c add toggleLeftPane command/shortcut, closes #2225 2021-10-12 19:29:42 +02:00
sigaloid
cfea2440fb fix mobile frontend, closes #2217 (#2223)
does this

rename

Update bug_report.yml

Update bug_report.yml

Update bug_report.yml

Update bug_report.yml

Update and rename feature_request.md to feature_request.yml

Co-authored-by: zadam <zadam.apps@gmail.com>
2021-10-12 18:57:07 +02:00
zadam
23e34e8c02 fix mobile frontend, closes #2217 2021-10-11 23:00:52 +02:00
zadam
8bd7b657f8 added option to disable backup, #2210 2021-10-11 22:30:23 +02:00
zadam
899d9e65fd Merge remote-tracking branch 'origin/master' 2021-10-11 21:08:48 +02:00
zadam
ec732c0a98 filter out duplicated note paths, fixes #2218 2021-10-11 21:08:25 +02:00
Tom Free
66797f34c4 upgrade node v14.17.6 for gitpod since optional chaining is required (#2219) 2021-10-11 20:54:01 +02:00
zadam
1ad25b063d change order of ribbon tabs so that type specific ones are in front 2021-10-10 21:47:56 +02:00
zadam
e09b2902fa fix large image deforming the note revisions dialog, closing #2216 2021-10-10 21:47:22 +02:00
zadam
f6776df645 link overflowing with ellipsis 2021-10-10 14:34:54 +02:00
zadam
f0c672445d show note icons also in bookmark folder 2021-10-10 14:10:51 +02:00
zadam
a033ddfcb7 Merge remote-tracking branch 'origin/master' 2021-10-10 14:09:42 +02:00
zadam
d02d846024 empty notes in note overview will display the list of children 2021-10-10 14:09:22 +02:00
sigaloid
a8b6538c4e Add issue templates (#2213)
* Create feature_request.md

* Create bug_report.md

* Update feature_request.md

* Update bug_report.md

* Update feature_request.md

* Update feature_request.md

* Update bug_report.md

* Update bug_report.md

* Update bug_report.md

* Update feature_request.md

* Update bug_report.md
2021-10-10 11:22:32 +02:00
zadam
4eb4a44331 fix reopening last tab for splits 2021-10-09 22:03:24 +02:00
Abitofevrything
c1e1f3df24 Add shortcut to reopen last closed tab, closes #2211 (#2214) 2021-10-09 21:20:12 +02:00
zadam
11e9f8403e release 0.48.0-beta 2021-10-08 22:32:59 +02:00
zadam
ba676587df fix importing notePosition of directories 2021-10-08 22:31:35 +02:00
zadam
20696aa0ab fix finding single note by label with mixed case 2021-10-08 22:13:39 +02:00
zadam
a08690b123 CKEditor 30 content styles 2021-10-08 18:17:17 +02:00
zadam
79f54b4e97 inactive tab background tweaks 2021-10-08 18:09:24 +02:00
zadam
973fe52275 lighter node style of note map in dark theme 2021-10-08 16:45:21 +02:00
zadam
5938e033d4 lighter node style of note map in dark theme 2021-10-08 16:38:37 +02:00
zadam
eecba725b0 bookmarking should be available for all note types 2021-10-08 16:18:00 +02:00
zadam
fa40a5f496 fixed demo document + added bookmarks 2021-10-08 15:48:15 +02:00
zadam
abbba6501d script execution results are also pojo-ized 2021-10-08 15:14:23 +02:00
zadam
824f5dbaac fix handling of string/empty responses 2021-10-07 22:14:23 +02:00
zadam
24a45b03f5 bookmark folder 2021-10-07 21:57:20 +02:00
zadam
e10e18e63a added optimized version for single label searching + noteset cache fix 2021-10-07 07:46:13 +02:00
zadam
7152c5e51d refactored separate RightDropdownButton from calendar widgets 2021-10-06 22:25:33 +02:00
zadam
711af02928 fixed leaking entities into the responses and thus increased performance of e.g. create/duplicate note 2021-10-06 20:52:23 +02:00
zadam
df8706026e caching initial noteset to improve search times 2021-10-06 19:59:29 +02:00
zadam
17fe9a6a1b added help button to JS code notes to navigate to API docs 2021-10-06 18:31:19 +02:00
zadam
2d08eb7366 fix "connected with changes" sync status icon 2021-10-06 18:13:58 +02:00
zadam
8d42ffca6d basic bookmark support 2021-10-05 22:08:02 +02:00
zadam
0654dc855f Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	package-lock.json
#	package.json
2021-10-05 19:45:32 +02:00
zadam
0571f02830 updated windows better-sqlite3 binary 2021-10-05 17:32:32 +02:00
zadam
b2b1c9ebb7 release 0.47.8 2021-10-04 22:18:33 +02:00
zadam
1f75b9c92f electron 13.5.1 to fix the TLS expiration issue 2021-10-04 22:16:51 +02:00
zadam
e2c4f32b5e added ckeditor with Find & Replace, for now without keyboard shortcut (ckeditor/ckeditor5#10645) 2021-10-04 21:53:57 +02:00
zadam
18ffcf7880 small fixes 2021-10-03 23:01:22 +02:00
Ben Jackson
6ae8508413 html_sanitizer: Demote H1 tags (#2190)
Generalize clipper.js support for removing H1 tags so it also applies to
imports. This will move all heading levels down to make room if
needed, only leaving duplicates at H6.
2021-10-03 20:56:08 +02:00
Abitofevrything
ec3b844026 Fix "Theme defined" option not working in font overrride (#2197) 2021-10-03 20:54:20 +02:00
zadam
a1ca538106 excludeFromTreeMap generalized to excludeFromNoteMap 2021-10-03 11:04:56 +02:00
zadam
75fc9e2048 small fixes 2021-10-03 10:42:46 +02:00
zadam
a1c1c7c830 added "reloadNeeded" to consistency checks so that entity changes fix won't force reload 2021-10-03 10:00:38 +02:00
zadam
e4a483aefe fix duplicate subtree 2021-10-02 23:26:18 +02:00
zadam
8c2a5d19f2 remove extra logging 2021-09-30 22:26:56 +02:00
Abitofevrything
2c450fc72d Allow HTML nodes in mermaid diagrams (#2192) 2021-09-30 20:12:23 +02:00
zadam
831de3ffed fix mermaid diagram size 2021-09-30 13:48:01 +02:00
zadam
291b434d70 added mermaid samples to demo document 2021-09-30 13:17:37 +02:00
zadam
a68fd5ab83 fixes 2021-09-30 13:02:07 +02:00
zadam
8a8bdaf80e updated API docs 2021-09-30 12:26:13 +02:00
zadam
26b89fc801 fix note revisions not displaying content length 2021-09-30 12:23:22 +02:00
zadam
af3fd61974 mermaid layout improvements 2021-09-30 10:18:03 +02:00
zadam
f4dde84f06 mermaid layout improvements 2021-09-30 09:48:03 +02:00
zadam
bc920dc5dc refactoring of mermaid support WIP 2021-09-29 22:14:45 +02:00
zadam
896c9cec04 refactoring of mermaid support WIP 2021-09-29 22:10:15 +02:00
Abitofevrything
b37bcd294c Implement mermaid diagrams (#2187)
* Start implementing mermaid diagrams

* Implement theming for mermaid diagrams

* Add edit tab to mermaid diagrams

* Remove comment

* Render mermaid diagrams in included notes

* Prevent mermaid notes from being removed to consistency checks
2021-09-29 21:54:56 +02:00
Ben Jackson
14f24c646a enex: Convert OneNote (via Evernote) todo images to Unicode checkboxes (#2189)
When a OneNote todo bullet is imported by Evernote it is converted to an
image showing the checkbox the way it looked in OneNote. This change
takes advantage of the consistency of that image hashing to convert
those images into unicode checkboxes (matching the existing ENEX
<en-todo> behavior) . It also removes the image attachments.
2021-09-29 18:11:04 +02:00
zadam
fea46bb150 ckeditor v30.0.0 2021-09-29 17:47:15 +02:00
zadam
37c30bf88a fix initializing new attribute in becca 2021-09-29 13:33:05 +02:00
zadam
d975acc99a fix collapsing/expanding the book note 2021-09-29 13:19:21 +02:00
zadam
c2d35dac4d small fixes and tweaks 2021-09-29 12:39:28 +02:00
zadam
5358b58191 fix double refresh of note map 2021-09-28 13:27:21 +02:00
zadam
0264e847ef fixes 2021-09-28 10:58:34 +02:00
zadam
c5917bfc78 fix "steel blue" demo theme 2021-09-28 10:02:25 +02:00
zadam
533fcd06e4 search should ignore diacritics, closes #2182 2021-09-27 22:09:55 +02:00
zadam
192a2fe9f9 Merge remote-tracking branch 'origin/master' 2021-09-27 21:02:04 +02:00
zadam
e6bc8ed3b5 allow overriding theme fonts 2021-09-27 21:01:56 +02:00
hyfree
8ff563ba40 Fix translation errors (#2180)
Fix translation errors
2021-09-27 14:37:29 +02:00
zadam
d5bd9875f9 fix websocket ping 2021-09-26 15:37:18 +02:00
zadam
113bebed3b switching themes via loading only specific CSS 2021-09-26 15:24:37 +02:00
zadam
2fcb0c05c0 added grey icon for the dark mode 2021-09-25 21:58:15 +02:00
zadam
fdb7b7721d right context menu on note map 2021-09-24 21:40:02 +02:00
Abitofevrything
3d9260c974 Add shortcut to delete newly created note quickly (#2177)
* Add shortcut to delete newly created note quickly

* Add space
2021-09-23 23:34:51 +02:00
zadam
8769fd71cb fix hidden notes appearing after creation in a new document 2021-09-23 23:30:30 +02:00
zadam
a2baa9bdb3 excludeFromTreeMap in demo document 2021-09-23 22:54:37 +02:00
zadam
88714cce94 simplify migration 2021-09-23 22:49:16 +02:00
zadam
bc1d438075 updated better sqlite 3 binaries 2021-09-23 22:36:12 +02:00
zadam
fd00f6bd97 removed older migrations since they don't work anyway (after becca refactoring) 2021-09-23 22:09:11 +02:00
zadam
b041d081db added migration to add excludeFromTreeMap for journal subtrees 2021-09-23 22:08:23 +02:00
zadam
fabf24a065 sizing of the link map 2021-09-22 23:02:38 +02:00
zadam
e3fc0968ba note map refactoring 2021-09-22 22:41:31 +02:00
zadam
a766374bf4 unified note map with ribbon map 2021-09-22 22:25:39 +02:00
zadam
0f693dae5e split of note map widget from type widget 2021-09-22 21:11:36 +02:00
zadam
208492bee1 tweaks to note map 2021-09-21 22:45:06 +02:00
zadam
b0d767df69 refresh note detail icon after type change 2021-09-21 20:28:52 +02:00
zadam
476b8250c9 note map refactoring 2021-09-20 23:04:41 +02:00
zadam
e4ba7d65e8 note map refactoring 2021-09-20 22:19:47 +02:00
zadam
9c9a3fc030 small refactorings of auto readonly size 2021-09-20 21:12:35 +02:00
Abitofevrything
b85cf07a28 Add config option to change automatic readonly size (#2174) 2021-09-20 21:08:41 +02:00
zadam
bdde52f004 global link map WIP 2021-09-20 20:02:23 +02:00
zadam
dd37f09309 global link map WIP 2021-09-18 14:29:41 +02:00
zadam
a0caa21458 global link map WIP 2021-09-17 22:34:23 +02:00
zadam
43e829ca99 global link map setup 2021-09-17 10:09:42 +02:00
zadam
ed26e32ccb skeleton for global link map 2021-09-16 23:09:48 +02:00
zadam
5866004e23 auto init of special notes after startup 2021-09-16 22:20:59 +02:00
zadam
06bcfe1aee refactoring of special notes route to a service 2021-09-16 22:09:39 +02:00
zadam
2d82da32d4 refactoring of "date-notes" to "special-notes" 2021-09-16 21:59:34 +02:00
zadam
2b017a956e store in CLS only entity change IDs instead of whole records 2021-09-16 15:02:20 +02:00
zadam
0448883782 option to erase notes immediately 2021-09-16 14:38:09 +02:00
zadam
9b9be5d155 reload frontend when consistency is fixed 2021-09-12 11:18:06 +02:00
zadam
3f2ee4aefd ckeditor fix to use correct modified mention plugin 2021-09-12 00:08:25 +02:00
zadam
b90ae8eb79 ckeditor fix 2021-09-11 22:01:04 +02:00
zadam
266807179c ckeditor upgrade to 29.2.0 2021-09-11 21:44:52 +02:00
zadam
4023c28f5e consistency_checks fix 2021-09-11 14:34:37 +02:00
zadam
010f075ac5 fix toggling protected flag and display of the title 2021-09-08 22:35:32 +02:00
zadam
151687cd9b fixing consistency checks 2021-09-08 21:54:26 +02:00
zadam
f24ea8137b revert of better sqlite3 dep for server build 2021-09-08 20:56:26 +02:00
zadam
b8d8e01908 updated icon 2021-09-07 23:14:17 +02:00
zadam
79d492d0f0 bug fixes 2021-09-07 22:56:54 +02:00
zadam
f0af26a57b Merge remote-tracking branch 'origin/master' 2021-09-07 22:37:12 +02:00
zadam
2b8c6e3dd0 bug fixes 2021-09-07 22:37:03 +02:00
Egor Dubenetskiy
061f8acf11 Add shortcut to follow link under text cursor (#1842) (#2148) 2021-09-05 12:24:38 +02:00
zadam
5cfd1c030d allow specifiyng sorted attribute (including off for overriding), #2142 2021-09-03 22:33:40 +02:00
zadam
6e300c7cf5 make sure the sorted branches are still sorted after drag & drop, #2142 2021-09-02 23:21:02 +02:00
zadam
167d4816fd display "multiple-parents" asterisk only for multiple non-search parents 2021-09-02 22:27:35 +02:00
zadam
3e5db71652 Merge remote-tracking branch 'origin/master' 2021-09-02 22:14:29 +02:00
zadam
1bc50ed976 strip # or ~ when getting attribute 2021-09-02 22:14:22 +02:00
zadam
08c638c2fa Create codeql-analysis.yml 2021-09-01 09:32:58 +02:00
zadam
5f22864a93 support image/jpg as well, closes #2103 2021-08-31 22:02:38 +02:00
zadam
cfcc34fa8e package upgrades (including #2134) 2021-08-31 21:54:42 +02:00
zadam
635f5fdc5b small refactoring 2021-08-26 22:10:59 +02:00
zadam
d0747b125c improvements in frontend sync (WIP) 2021-08-25 22:49:24 +02:00
zadam
66374bf95f improvements in frontend sync (WIP) 2021-08-24 22:59:51 +02:00
zadam
d27fcaf317 improvements in frontend sync (WIP) 2021-08-24 22:37:00 +02:00
zadam
0ee093f038 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	Dockerfile
#	bin/build-server.sh
#	package-lock.json
#	src/public/app/layouts/mobile_layout.js
2021-08-23 22:27:19 +02:00
zadam
06eb0ce910 alias shell with bash 2021-08-23 22:26:01 +02:00
zadam
c59b3a0c5c release 0.47.7 2021-08-22 12:36:49 +02:00
zadam
08eda83700 node update to 14.17.5 2021-08-22 12:25:50 +02:00
zadam
d23bb5fd17 note title gets overflown by long content 2021-08-22 12:21:22 +02:00
zadam
8cb07525cf Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	package-lock.json
2021-08-21 21:32:11 +02:00
zadam
dc4c922edb fix imported strikethrough text, closes #2110 2021-08-21 21:31:30 +02:00
zadam
c3ed673453 release 0.47.6 2021-08-21 20:56:58 +02:00
zadam
3fd16a16e8 fix deletion in the mobile frontend, closes #2114 2021-08-21 20:53:45 +02:00
zadam
3448eba7b9 fix importing image captions, closes #2113
(cherry picked from commit e050e380b9)
2021-08-21 20:23:55 +02:00
zadam
ad8f374276 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	package.json
2021-08-21 20:20:09 +02:00
zadam
19a6d89d4f fix include note PDF sizing, closes #2116 2021-08-21 20:19:02 +02:00
zadam
b99d83af50 improvements in frontend sync (WIP) 2021-08-20 21:42:06 +02:00
zadam
e050e380b9 fix importing image captions, closes #2113 2021-08-20 21:40:28 +02:00
zadam
68d599ed19 fix dynamic positioning 2021-08-20 21:39:56 +02:00
zadam
9d9bc31d91 fixes in frontend sync 2021-08-14 10:13:59 +02:00
zadam
b619a6515b fix first "0-24:00:00.000" log time 2021-08-12 20:57:43 +02:00
zadam
13a16e8251 force attribute value to be a string, closes #2104 2021-08-12 20:42:35 +02:00
zadam
86a53ceebb updating becca after sync 2021-08-07 21:21:30 +02:00
zadam
669eaa7509 fix SQL console 2021-07-27 22:08:41 +02:00
zadam
f50084dc1b removed annoying "sync update in progress" toast message 2021-07-26 21:28:45 +02:00
zadam
3a78a75afc fixed frontend update after note deletion 2021-07-26 21:11:51 +02:00
zadam
6e7b722bf2 fixed image being too high 2021-07-26 20:18:57 +02:00
zadam
4ca0f4b06b tree item styling based on flex, fixed root element jumping on hover 2021-07-25 22:46:45 +02:00
zadam
a33661d050 websocket events fill additional data from becca instead of database 2021-07-25 21:25:06 +02:00
zadam
f1338bb643 fix moving notes up and down using keyboard 2021-07-25 20:55:41 +02:00
zadam
b6b6d11ef7 keep sorting for content hash computation backwards compatible 2021-07-25 10:58:50 +02:00
zadam
17a6c94f66 fix errors popping up when closing tabs with multiple panes 2021-07-24 22:51:12 +02:00
zadam
e74979ccc1 fix edited notes ribbon widget 2021-07-24 22:13:32 +02:00
zadam
e003341dff optimized becca loader with raw queries 2021-07-24 21:10:16 +02:00
zadam
5c4369206a optimized content hash computation using raw queries 2021-07-24 12:04:48 +02:00
zadam
507a0e2e1d "pojoing" backend entity responses to significantly speed up 2021-07-24 11:38:57 +02:00
zadam
b381331029 refactoring of date notes route 2021-07-24 11:28:47 +02:00
zadam
af703445e1 hover for tree item buttons 2021-07-24 09:36:52 +02:00
zadam
c508217604 added underline heading style and make it a default 2021-07-23 16:04:56 +02:00
zadam
6a1287a3de fixes in the demo document 2021-07-23 14:53:31 +02:00
zadam
7261ab69bc add ignoreMissing flag to becca's getNotes() 2021-07-22 21:23:01 +02:00
zadam
f9cfd134b7 fixed corner cases in becca updates from sync 2021-07-22 20:19:44 +02:00
Abitofevrything
89d28ef27c Various window border related fixes (#2077)
* Remove gap between window control buttons and top of screen, add square hitbox to window control buttons

* Add better overflow detection for context menu

* Remove gap between tabs and top of screen
2021-07-22 19:37:53 +02:00
zadam
9da8d466b8 fix note hoisting 2021-07-21 22:47:52 +02:00
zadam
74d0626dc9 Merge remote-tracking branch 'origin/master' 2021-07-21 22:07:13 +02:00
zadam
830a357b9a better styling for drop marker #2073 2021-07-21 21:12:21 +02:00
Abitofevrything
7b129c7c34 Check for active node before create note in createNoteAfter (#2074) 2021-07-21 20:19:17 +02:00
zadam
adc98d4515 fix corner case when deleting a note with not yet downloaded images, closes #2073 2021-07-21 20:18:03 +02:00
zadam
f3959cf2aa styles for dropping items in the tree, WIP 2021-07-20 22:07:14 +02:00
zadam
6fdabbc73b fixed styling for loading notes 2021-07-20 21:25:26 +02:00
zadam
de6ff09bb9 fix moving notes 2021-07-20 21:12:23 +02:00
zadam
c82308489b fix import 2021-07-20 13:29:11 +02:00
zadam
98ee3b029a Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/becca/becca_service.js
2021-07-08 13:11:25 +02:00
zadam
a6bef45a30 fix "root" note in edited notes, closes #2058 2021-07-08 13:06:22 +02:00
zadam
05d077ce28 removed green theme 2021-07-05 17:10:10 +02:00
zadam
9adf4d7e8e fixed calendar widget when open in a non-date note 2021-07-05 15:50:21 +02:00
zadam
e2819109e9 added edited notes ribbon widget 2021-07-05 14:56:40 +02:00
zadam
3c8e267aad added calendar to the sidebar 2021-07-05 14:46:20 +02:00
zadam
da0670188b Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/services/ws.js
2021-07-05 10:14:37 +02:00
zadam
65938c5272 enable autoformat plugin in ckeditor build, closes #1339 2021-07-05 10:13:52 +02:00
zadam
7ea72632b8 display keyboard shortcuts in button widget title 2021-07-05 09:59:03 +02:00
zadam
9ca225b40f ribbon widgets titles show associated keyboard shortcuts 2021-07-05 09:44:41 +02:00
zadam
b68bdc5005 hide global menu tooltip upon click 2021-07-05 08:59:36 +02:00
zadam
9e77a424a4 fix sync status button 2021-07-04 21:24:47 +02:00
zadam
e25b965cb3 fix searching by label 2021-07-04 21:05:47 +02:00
zadam
8d3a3d4873 fix content length in note revisions 2021-07-04 16:49:23 +02:00
zadam
c115628f1f full search should be already triggered when going from quick search 2021-07-04 16:46:57 +02:00
zadam
703fbd30df css fixes 2021-07-04 15:49:52 +02:00
zadam
5011b6a51a don't try to fill additional properties for erased entities 2021-07-03 20:52:40 +02:00
zadam
4cc02ffb31 fix search 2021-07-02 23:22:10 +02:00
zadam
1e767482b4 removed black theme from setup 2021-06-30 21:30:54 +02:00
zadam
2035304b63 cleanup of entity changes processing 2021-06-30 20:54:15 +02:00
zadam
5be7f003ca sync fixes 2021-06-29 23:45:45 +02:00
zadam
b660238a40 backend import unification 2021-06-29 22:15:57 +02:00
zadam
b9ff481eb7 Merge remote-tracking branch 'origin/stable' into redesign
# Conflicts:
#	package.json
2021-06-29 20:55:58 +02:00
zadam
eebbf74517 Merge remote-tracking branch 'origin/master' into redesign 2021-06-29 20:55:15 +02:00
zadam
61e78858bc fix random ordering in search, fixes #2047 2021-06-29 20:54:56 +02:00
zadam
0351d7eff1 keyboard shortcuts for ribbon tabs 2021-06-27 12:53:05 +02:00
zadam
9e1c9782ff use MontserratLight also for setup 2021-06-26 23:20:12 +02:00
zadam
b2148f4a18 updated demo document with adjusted steel blue theme 2021-06-26 23:10:03 +02:00
zadam
16cc84be99 add back utcDateModified to Attribute and Branch becca entities 2021-06-26 17:32:40 +02:00
zadam
0265c190db adding check to the selected editability 2021-06-26 17:21:54 +02:00
zadam
32c88219c3 switcher for editability 2021-06-26 17:08:50 +02:00
zadam
962d5a5674 fixes 2021-06-26 13:35:36 +02:00
zadam
995e6c2fef release 0.47.5 2021-06-25 21:26:48 +02:00
zadam
0a2807c0b3 update to electron 13.1.4 which fixes the PDF display on Windows, closes #1976 2021-06-25 21:26:15 +02:00
zadam
1b9c3b0759 keep focus when clicking on edit read only note 2021-06-24 23:50:56 +02:00
zadam
f1a36f6cea add keyboard shortcut for the edit button, #2036 2021-06-24 20:27:04 +02:00
zadam
d9ec8bba80 fix layouting 2021-06-15 23:04:13 +02:00
zadam
02da5b598c added "edit" button into ribbon button container 2021-06-15 22:59:13 +02:00
zadam
2220c4491b layout fixes 2021-06-15 21:53:22 +02:00
zadam
fb31acc8e0 layout changes 2021-06-13 22:55:31 +02:00
dependabot[bot]
92cf2c18fa Bump normalize-url from 4.5.0 to 4.5.1 (#2006)
Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/sindresorhus/normalize-url/releases)
- [Commits](https://github.com/sindresorhus/normalize-url/commits)

---
updated-dependencies:
- dependency-name: normalize-url
  dependency-type: indirect
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-12 12:01:16 +02:00
alex
c5182b8757 add Chinese wiki support (#2013) 2021-06-12 12:00:55 +02:00
zadam
e054a1694e using rate limiter 2021-06-11 21:00:06 +02:00
zadam
3a7da1d561 icon and theme experiments 2021-06-06 22:15:51 +02:00
zadam
3893f663d0 sql console also doesn't create a normal note by default 2021-06-06 13:38:01 +02:00
zadam
a0de3c97a5 note paths widget does not show hidden path 2021-06-06 11:13:17 +02:00
zadam
c886583396 added "save search to note" button 2021-06-06 11:01:10 +02:00
zadam
e48609aa68 introducing hidden notes, WIP 2021-06-05 23:35:47 +02:00
zadam
882912826f fix ribbon shrinking/wrap 2021-06-05 22:40:17 +02:00
zadam
6d51593b7d removed CSS contain from widgets 2021-06-05 22:07:15 +02:00
zadam
faab6be48d removed zen mode 2021-06-05 21:56:39 +02:00
zadam
8debf18984 added plugin buttons to the launcher pane 2021-06-05 14:12:17 +02:00
zadam
4bf1c25721 fixed resizer for both left and right pane 2021-06-05 14:01:21 +02:00
zadam
a1d7737551 right pane restoration for custom widgets 2021-06-03 23:34:40 +02:00
zadam
2bfd7b844c refactoring of pane => split, "pane" keeps its old meaning (left-pane, center-pane, right-pane) 2021-06-03 22:23:11 +02:00
zadam
ac04be4433 mobile frontend fixes 2021-06-03 21:47:25 +02:00
zadam
5e5df72020 theme refactoring 2021-06-03 12:57:39 +02:00
zadam
f1344e3b95 refactoring of "collapsible section container" into "ribbon container" 2021-06-03 12:47:13 +02:00
zadam
9216e430db fix relation map 2021-06-03 12:32:48 +02:00
zadam
855b876d50 Merge remote-tracking branch 'origin/stable' into redesign 2021-06-03 12:29:58 +02:00
zadam
c04bbd4973 context menu now offer option to open notes in a new pane 2021-06-03 12:25:33 +02:00
zadam
1a615398aa docker now uses node 14.17 as other builds 2021-06-02 23:37:55 +02:00
zadam
b557a44f34 release 0.47.4 2021-06-02 21:44:19 +02:00
zadam
f50bb2278c Merge remote-tracking branch 'origin/stable' into stable 2021-06-02 21:41:06 +02:00
zadam
6b68068cde Merge remote-tracking branch 'origin/master' into stable 2021-06-02 21:40:43 +02:00
zadam
7ed816f1b2 dark theme tweaks 2021-06-02 21:39:18 +02:00
zadam
f8dd8ebf1a dark theme tweaks 2021-06-02 21:23:40 +02:00
zadam
4c64bd852e Merge remote-tracking branch 'origin/stable' into redesign 2021-06-01 23:33:07 +02:00
zadam
af62b07d5b Merge remote-tracking branch 'origin/master' into redesign 2021-06-01 23:32:53 +02:00
zadam
4338f65e01 dark mode fixes + refactoring 2021-06-01 23:19:49 +02:00
zadam
9a147365f5 link map lazy loading 2021-06-01 22:03:38 +02:00
zadam
e48bbe5b19 link map WIP 2021-05-31 23:38:47 +02:00
zadam
bdff1c1246 removal of link map service 2021-05-31 21:31:07 +02:00
zadam
d4a955a3f5 cleaned up link map 2021-05-31 21:23:01 +02:00
zadam
07e214c564 link map zooming 2021-05-31 21:20:30 +02:00
zadam
b351157a6a link map WIP 2021-05-30 23:21:34 +02:00
zadam
56378cd0f5 reorder database initialization so that all critical sections are in the same transaction, #1985 2021-05-30 22:03:41 +02:00
zadam
a76e3f6e2d correctly logging slow async requests 2021-05-30 21:21:20 +02:00
zadam
f5573fcad4 starting work on link map reimplementation using force-graph library 2021-05-29 22:52:32 +02:00
zadam
60f88574b0 put show source button back to note actions since it's pretty rare 2021-05-29 20:54:11 +02:00
zadam
65c3bcb565 don't override section activation if section if open 2021-05-29 14:25:05 +02:00
zadam
ef4bc13dd1 section widgets are updated lazily 2021-05-29 14:13:22 +02:00
zadam
aa901b67ed remove unused static getType() from section widgets 2021-05-29 13:51:21 +02:00
zadam
7a389baf08 moved to section widgets 2021-05-29 13:24:47 +02:00
zadam
57b6271c0b similar notes section widget 2021-05-29 13:24:14 +02:00
zadam
9532a5662f added note paths section container 2021-05-29 13:06:09 +02:00
zadam
520db931ae maximize button 2021-05-28 23:52:42 +02:00
zadam
5e19a37df7 fix rendering 2021-05-28 23:21:55 +02:00
zadam
4b6b8b1678 link map section widget 2021-05-28 23:19:11 +02:00
zadam
a3d44fbdef button tweaks 2021-05-28 22:47:59 +02:00
zadam
7fcf90437a button changes and book properties 2021-05-27 23:17:13 +02:00
zadam
614b1bdbaf added safe mode scripts 2021-05-27 21:29:23 +02:00
zadam
4d213300ac added buttons to section container 2021-05-26 23:08:00 +02:00
zadam
b7ca3dec54 added note info into section container 2021-05-26 23:00:40 +02:00
zadam
c4987c4fd1 added basic properties 2021-05-26 22:41:55 +02:00
zadam
f176191efb Merge remote-tracking branch 'origin/stable' into redesign
# Conflicts:
#	package-lock.json
#	package.json
2021-05-26 21:44:08 +02:00
zadam
dc5304faa0 updated ckeditor content styles 2021-05-26 21:41:58 +02:00
zadam
205f9953f9 Merge remote-tracking branch 'origin/stable' into redesign
# Conflicts:
#	package-lock.json
#	package.json
2021-05-26 21:27:06 +02:00
zadam
58d61800f3 tweaks 2021-05-26 21:26:12 +02:00
zadam
b9639bffce imported internal links crash ckeditor, #1979 2021-05-25 21:45:59 +02:00
zadam
3c7232f427 don't error out when backend log does not exist yet, fixes #1977 2021-05-25 21:03:00 +02:00
zadam
5707b7e29a closing panes 2021-05-24 22:29:49 +02:00
zadam
2f5d3729de fixes 2021-05-24 21:43:24 +02:00
zadam
bae8551652 open the pane on the correct position 2021-05-24 21:05:44 +02:00
zadam
1f5e4530c3 moved note actions button into section container 2021-05-24 14:39:44 +02:00
zadam
7d94202460 reworked section container to be icon based 2021-05-23 23:41:01 +02:00
zadam
30cc566518 tweaks 2021-05-23 22:24:04 +02:00
zadam
85933771f8 tab styling changes 2021-05-23 21:24:22 +02:00
zadam
e924662a29 tree visual changes, fonts etc. 2021-05-23 20:26:54 +02:00
zadam
2985100801 visual tweaks 2021-05-22 23:25:44 +02:00
zadam
d68ea201a3 fixes 2021-05-22 22:55:24 +02:00
zadam
7528181ca2 nice tooltips for side buttons 2021-05-22 21:51:40 +02:00
zadam
1302765478 added sidebar toggle button 2021-05-22 21:35:25 +02:00
zadam
5b220adc31 refactored TabContext => NoteContext 2021-05-22 17:58:46 +02:00
zadam
98dfc77195 refactored TabContext => NoteContext 2021-05-22 13:04:08 +02:00
zadam
1a0aaf4a30 refactored TabContext => NoteContext 2021-05-22 12:42:34 +02:00
zadam
79a85a0aa7 refactored TabContext => NoteContext 2021-05-22 12:35:41 +02:00
zadam
274cf7312c refactored TabContext => NoteContext 2021-05-22 12:26:45 +02:00
zadam
29e4e2afbb split window WIP 2021-05-21 22:44:08 +02:00
zadam
39f0f26f28 split window WIP 2021-05-21 22:34:40 +02:00
zadam
1a13132a69 split window WIP 2021-05-20 23:13:34 +02:00
zadam
a3847842cb split window WIP 2021-05-19 23:00:03 +02:00
zadam
b7bd5396d1 split window WIP 2021-05-19 22:45:34 +02:00
zadam
8c1c9b00e2 buttons on the left improvements 2021-05-18 22:49:47 +02:00
zadam
845f5d15c4 buttons on the left 2021-05-18 22:14:35 +02:00
zadam
d18b95d87c Merge branch 'next' into redesign 2021-05-18 21:08:02 +02:00
zadam
731051154b Merge branch 'stable' into next
# Conflicts:
#	package.json
2021-05-18 21:07:29 +02:00
zadam
a093508fbe converting note properties to methods 2021-05-18 20:56:49 +02:00
zadam
5860b2eebb style cleanup 2021-05-18 20:46:19 +02:00
zadam
a4aaa49774 fix width in zen mode, closes #1965 2021-05-18 20:30:06 +02:00
zadam
a4c7069856 Delete FUNDING.yml 2021-05-18 19:56:00 +02:00
zadam
7cad65b370 Update FUNDING.yml 2021-05-18 19:55:45 +02:00
zadam
3ead734323 Create FUNDING.yml 2021-05-18 19:54:19 +02:00
zadam
2451596e8c converting note properties to methods 2021-05-17 22:35:36 +02:00
zadam
a5d702b143 moved becca to top level source dir 2021-05-17 22:10:00 +02:00
zadam
439ef4a8cb moved becca to top level source dir 2021-05-17 22:09:49 +02:00
zadam
8bd3e17a3b removed legacy entities and repository 2021-05-17 22:05:35 +02:00
zadam
7a7c890946 redesign experiments 2021-05-17 21:46:18 +02:00
zadam
cb8e551ee0 release 0.47.3 2021-05-15 23:05:20 +02:00
zadam
04f249e800 backend scripts should not be async because of transaction management 2021-05-15 22:57:23 +02:00
zadam
a65eda5e4a Merge remote-tracking branch 'origin/master' into next 2021-05-15 22:45:28 +02:00
zadam
9645a07f2f Merge remote-tracking branch 'origin/stable' into next
# Conflicts:
#	package-lock.json
#	package.json
2021-05-15 22:45:11 +02:00
zadam
f6dd1110e8 fix sync status 2021-05-15 22:00:53 +02:00
zadam
623200b92b fix "force note sync" 2021-05-15 14:04:01 +02:00
zadam
4ff40ba14f fix sync status in-progress 2021-05-15 13:44:12 +02:00
zadam
16563eaba4 limit data base filename in ZIP export to 30 characters 2021-05-15 13:22:54 +02:00
zadam
caa6e9ee72 use archiver.js to export instead of yazl, #1938 2021-05-14 22:57:44 +02:00
zadam
f4a58a2598 Merge remote-tracking branch 'origin/master' 2021-05-14 22:35:15 +02:00
zadam
cecce1df20 electron upgrade 2021-05-14 22:23:11 +02:00
zadam
2030c8e995 fallback value for isErased for 0173 migration, #1937 2021-05-14 21:52:14 +02:00
zadam
8a9bd4deb4 zooming with ctrl + mousewheel 2021-05-12 22:38:17 +02:00
zadam
8417d4a4ea various becca migration fixes 2021-05-11 22:00:16 +02:00
zadam
5d58520949 froca should not keep any deleted notes 2021-05-09 22:00:21 +02:00
zadam
d8d15b528e fix .runOnBackend() API call 2021-05-09 21:29:59 +02:00
zadam
1d008cad13 fixes 2021-05-09 20:46:32 +02:00
zadam
ef0941479c fix undelete 2021-05-09 11:12:53 +02:00
zadam
9afea492db delete note fixes 2021-05-08 23:31:20 +02:00
zadam
84246fd197 adding missing .getPojo() to becca entities 2021-05-08 22:13:08 +02:00
zadam
9441cb177f undelete becca conversion 2021-05-08 22:01:14 +02:00
zadam
bcfe097dd6 refactoring of becca entity saving 2021-05-08 21:10:58 +02:00
Jules-Bertholet
a410ed1b74 Update KaTeX to v0.13.9 (#1925)
* Update KaTeX to v0.13.9

* Allow KaTeX commands like \url and \includegraphics
https://katex.org/docs/options.html
2021-05-08 20:58:56 +02:00
zadam
2edc7dbf58 merge fixes 2021-05-08 11:20:20 +02:00
zadam
051b9dff21 Merge remote-tracking branch 'origin/stable' into next
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/entities/note_short.js
#	src/public/app/services/protected_session.js
#	src/routes/api/login.js
2021-05-08 10:58:38 +02:00
zadam
de6108f95d protected session is now global application state to avoid weird issues with multiple tabs/windows/reloads 2021-05-07 22:23:49 +02:00
zadam
fddab59265 added note.executeScript() 2021-05-07 21:23:10 +02:00
Jules-Bertholet
1308dc20e8 Add support for mhchem markup in KaTeX (#1917) 2021-05-06 22:38:56 +02:00
zadam
e257634ccf becca conversion WIP 2021-05-02 22:47:57 +02:00
zadam
3091119893 becca conversion WIP 2021-05-02 21:34:57 +02:00
zadam
c035627f0a use .markAsDeleted() instead of setting .isDeleted manually 2021-05-02 20:32:50 +02:00
zadam
273d4e0052 becca conversion WIP 2021-05-02 19:59:16 +02:00
zadam
77eac8f764 becca conversion WIP 2021-05-02 12:02:32 +02:00
zadam
1af10d48a2 becca conversion WIP 2021-05-02 11:23:58 +02:00
zadam
d13c8771ca becca conversion WIP 2021-05-01 21:52:22 +02:00
zadam
6626f100ad becca conversion WIP 2021-05-01 11:38:20 +02:00
zadam
ccadff5015 becca conversion WIP 2021-04-30 23:10:25 +02:00
zadam
e41be520a8 becca conversion WIP 2021-04-30 22:13:13 +02:00
zadam
43eb248450 Merge branch 'master' into next 2021-04-29 22:09:48 +02:00
zadam
f22c76d9fb fix focusing tree from note detail, closes #1897 2021-04-27 23:05:28 +02:00
zadam
b1131844d6 fix filling entity changes from Options' Advanced tab, closes #1898 2021-04-27 22:59:08 +02:00
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
219098ab53 more becca changes 2021-04-26 22:24:55 +02:00
zadam
e466c393eb converted NoteRevision entity to the becca 2021-04-26 22:18:14 +02:00
zadam
d8f1c39282 converted NoteRevision entity to the becca 2021-04-26 22:00:55 +02:00
zadam
cb3a5bba61 Merge branch 'master' into next
# Conflicts:
#	package-lock.json
2021-04-26 21:45:37 +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
zadam
93cae44ba0 subtree duplication with becca 2021-04-25 22:02:32 +02:00
zadam
a5ee590544 after note creation with becca 2021-04-25 21:24:32 +02:00
zadam
6c5b1420d2 basic note creation with becca 2021-04-25 21:19:18 +02:00
zadam
8d8d654fe8 becca entities enriched with functionality from repository entities 2021-04-25 20:00:42 +02:00
zadam
7494491560 Merge remote-tracking branch 'origin/master' into next
# Conflicts:
#	package-lock.json
#	src/public/app/services/note_content_renderer.js
#	src/public/stylesheets/style.css
#	src/routes/api/files.js
#	src/routes/routes.js
2021-04-25 11:14:45 +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
79bb249f3b implemented audio/video in note content renderer + streaming API #886 2021-04-17 22:35:47 +02:00
zadam
1fdf889ccf refactoring 2021-04-17 20:52:46 +02:00
zadam
42510fda5c renamed also cache files/modules 2021-04-16 23:01:56 +02:00
zadam
f7e86c5be0 renamed noteCache into becca 2021-04-16 23:00:08 +02:00
zadam
af5b1021c7 renamed treeCache into froca 2021-04-16 22:57:37 +02:00
zadam
8e1b8ab26c show not set keyboard shortcuts as "not set", #1851 2021-04-15 21:45:37 +02:00
zadam
4311834d75 reload note cache if transaction rollback is detected 2021-04-14 22:57:45 +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
772 changed files with 40826 additions and 25806 deletions

1
.github/FUNDING.yml vendored
View File

@@ -1,3 +1,4 @@
# These are supported funding model platforms
github: [zadam]
custom: ["https://paypal.me/za4am"]

63
.github/ISSUE_TEMPLATE/bug_report.yml vendored Normal file
View File

@@ -0,0 +1,63 @@
name: Bug Report
description: Report a bug
title: "(Bug report) "
labels: "Type: Bug"
body:
- type: checkboxes
attributes:
label: Preflight Checklist
description: Please ensure you've completed all of the following.
options:
- label: I have searched the [issue tracker](https://www.github.com/zadam/trilium/issues) for a bug report that matches the one I want to file, without success.
required: true
- type: input
attributes:
label: Trilium Version
description: What version of Trilium are you using?
placeholder: 0.48.0-beta
validations:
required: true
- type: dropdown
attributes:
label: What operating system are you using?
options:
- Windows
- macOS
- Ubuntu
- Other Linux
- Other (specify below)
validations:
required: true
- type: dropdown
attributes:
label: What is your setup?
description: https://github.com/zadam/trilium/wiki#choose-the-setup
options:
- Local (no sync)
- Local + server sync
- Server access only
validations:
required: true
- type: input
attributes:
label: Operating System Version
description: What operating system version are you using? On Windows, click Start button > Settings > System > About. On macOS, click the Apple Menu > About This Mac. On Linux, use lsb_release or uname -a.
placeholder: "e.g. Windows 10 version 1909, macOS Catalina 10.15.7, or Ubuntu 20.04"
validations:
required: true
- type: textarea
attributes:
label: Expected Behavior
description: A clear and concise description of what you expected to happen.
validations:
required: true
- type: textarea
attributes:
label: Actual Behavior
description: A clear description of what actually happens.
validations:
required: true
- type: textarea
attributes:
label: Additional Information
description: If your problem needs further explanation, or if the issue you're seeing cannot be reproduced in a gist, please add more information here.

View File

@@ -0,0 +1,22 @@
name: Feature Request
description: Report a bug
title: "(Feature request) "
labels: "Type: Enhancement"
body:
- type: checkboxes
attributes:
label: Preflight Checklist
description: Please ensure you've completed all of the following.
options:
- label: I have searched the [issue tracker](https://www.github.com/zadam/trilium/issues) for a feature request that matches the one I want to file, without success.
required: true
- type: textarea
attributes:
label: Describe feature
description: A clear and concise description of what you want to be added..
validations:
required: true
- type: textarea
attributes:
label: Additional Information
description: If your problem needs further explanation, or if the issue you're seeing cannot be reproduced in a gist, please add more information here.

71
.github/workflows/codeql-analysis.yml vendored Normal file
View File

@@ -0,0 +1,71 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '37 4 * * 1'
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
steps:
- name: Checkout repository
uses: actions/checkout@v2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
# Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
#- run: |
# make bootstrap
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1

View File

@@ -2,7 +2,7 @@ image:
file: .gitpod.dockerfile
tasks:
- before: nvm install 10 && nvm use 10
- before: nvm install 14.17.6 && nvm use 14.17.6
init: npm install
command: npm run start-server

5
.idea/dataSources.xml generated
View File

@@ -1,11 +1,12 @@
<?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="4e69c96a-8a2b-43f5-9b40-d1608f75f7a4">
<data-source source="LOCAL" name="SQLite - document.db" uuid="30cef30d-e704-484d-a4ca-5d3bfc2ece63">
<driver-ref>sqlite.xerial</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
<jdbc-url>jdbc:sqlite:$USER_HOME$/trilium-data/document.db</jdbc-url>
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/../trilium-data/document.db</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>
</project>

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>

2
.idea/misc.xml generated
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>

10
.idea/runConfigurations.xml generated Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

1
.idea/sqldialects.xml generated
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>

3
.idea/vcs.xml generated
View File

@@ -2,6 +2,5 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
</component>
</project>
</project>

View File

@@ -1,4 +1,4 @@
FROM node:12.19.0-alpine
FROM node:14.17.6-alpine
# Create app directory
WORKDIR /usr/src/app

View File

@@ -1,4 +1,6 @@
# Trilium注意事项
# 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)以快速了解:
@@ -35,6 +37,8 @@ Trilium是作为桌面应用程序Linux和Windows或服务器上托管的W
[有关文档页面的完整列表请参见Wiki。](https://github.com/zadam/trilium/wiki/)
[中文Wiki在这里](https://github.com/baddate/trilium/wiki/)
您还可以阅读[个人知识库模式](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base)以获取有关如何使用Trilium的灵感。
## 贡献
@@ -55,4 +59,4 @@ 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)
* [jsPlumb](https://github.com/jsplumb/jsplumb)强大的可视化连接库。- 用于[关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map)

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:
@@ -55,3 +57,7 @@ npm run start-server
* [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)
## 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
README.ru.md Normal file
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 Лицензии, либо (по вашему выбору) любой более поздней версии.

3
TODO Normal file
View File

@@ -0,0 +1,3 @@
- new icon
- polish becca entities API
- separate private and public APIs in becca entities

View File

@@ -27,8 +27,14 @@ 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/portable-trilium.sh $BUILD_DIR/
chmod 755 $BUILD_DIR/portable-trilium.sh
cp bin/tpl/trilium-portable.sh $BUILD_DIR/
chmod 755 $BUILD_DIR/trilium-portable.sh
cp bin/tpl/trilium-safe-mode.sh $BUILD_DIR/
chmod 755 $BUILD_DIR/trilium-safe-mode.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`

View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash
PKG_DIR=dist/trilium-linux-x64-server
NODE_VERSION=12.19.0
NODE_VERSION=14.17.6
if [ "$1" != "DONTCOPY" ]
then
@@ -10,7 +10,7 @@ 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 ..

View File

@@ -25,7 +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/portable-trilium.bat $BUILD_DIR/
cp bin/tpl/trilium-portable.bat $BUILD_DIR/
cp bin/tpl/trilium-no-cert-check.bat $BUILD_DIR/
cp bin/tpl/trilium-safe-mode.bat $BUILD_DIR/
echo "Zipping windows x64 electron distribution..."
VERSION=`jq -r ".version" package.json`

View File

@@ -5,7 +5,7 @@ if [[ $# -eq 0 ]] ; then
exit 1
fi
npm run webpack
n exec 14.17.6 npm run webpack
DIR=$1
@@ -27,7 +27,7 @@ cp -r electron.js $DIR/
cp webpack-* $DIR/
# run in subshell (so we return to original dir)
(cd $DIR && npm install --only=prod)
(cd $DIR && n exec 14.17.6 npm install --only=prod)
# cleanup of useless files in dependencies
rm -r $DIR/node_modules/image-q/demo

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

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!"

View File

@@ -0,0 +1,4 @@
SET DIR=%~dp0
set NODE_TLS_REJECT_UNAUTHORIZED=0
cd %DIR%
start trilium.exe

View File

@@ -0,0 +1,7 @@
#!/usr/bin/env sh
DIR=`dirname "$0"`
export NODE_TLS_REJECT_UNAUTHORIZED=0
"$DIR/trilium"

View File

@@ -0,0 +1,4 @@
SET DIR=%~dp0
SET TRILIUM_SAFE_MODE=1
cd %DIR%
start trilium.exe

View File

@@ -0,0 +1,7 @@
#!/usr/bin/env sh
DIR=`dirname "$0"`
export TRILIUM_SAFE_MODE=1
"$DIR/trilium"

11
db/TODO.txt Normal file
View File

@@ -0,0 +1,11 @@
- drop branches.utcDateCreated - not used for anything
- drop options.utcDateCreated - not used for anything
- isDeleted = 0 by default
- rename openTabs to openNoteContexts
- migrate black theme to dark theme
- unify readOnly handling to a single attribute:
* readOnly - like now
* readOnly=auto - like without readOnly (used to override inherited readOnly)
* readOnly=never - like autoReadOnlyDisabled
- remove focusOnAttributesKeyboardShortcut
- rename white theme to "light" theme (it's not completely white and matches well to dark theme)

Binary file not shown.

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;

View File

@@ -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;

View File

@@ -1 +0,0 @@
ALTER TABLE notes ADD COLUMN is_deleted INTEGER NOT NULL DEFAULT 0

View File

@@ -1 +0,0 @@
ALTER TABLE notes_tree ADD COLUMN date_modified INTEGER NOT NULL DEFAULT 0

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')

View File

@@ -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;

View File

@@ -1 +0,0 @@
ALTER TABLE notes_history ADD COLUMN encryption INTEGER DEFAULT 0

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;

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`
);

View File

@@ -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`
);

View File

@@ -1 +0,0 @@
INSERT INTO options (opt_name, opt_value) VALUES ('last_synced', 0)

View File

@@ -1,5 +0,0 @@
CREATE UNIQUE INDEX `IDX_notes_history_note_from_to` ON `notes_history` (
`note_id`,
`date_modified_from`,
`date_modified_to`
);

View File

@@ -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);

View File

@@ -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;

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);

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);

View File

@@ -1 +0,0 @@
INSERT INTO options (opt_name, opt_value) VALUES ('document_id', '');

View File

@@ -1 +0,0 @@
INSERT INTO options (opt_name, opt_value) VALUES ('document_secret', '');

View File

@@ -1 +0,0 @@
ALTER TABLE options ADD COLUMN date_modified INTEGER NOT NULL DEFAULT 0

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`
);

View File

@@ -1 +0,0 @@
ALTER TABLE sync ADD COLUMN source_id TEXT

View File

@@ -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`
);

View File

@@ -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`
);

View File

@@ -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;

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`
);

View File

@@ -1,4 +0,0 @@
CREATE TABLE `recent_notes` (
`note_id` TEXT NOT NULL PRIMARY KEY,
`date_accessed` INTEGER NOT NULL
);

View File

@@ -1 +0,0 @@
ALTER TABLE recent_notes ADD COLUMN is_deleted INT;

View File

@@ -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`
);

View File

@@ -1 +0,0 @@
UPDATE options SET opt_name = 'protected_session_timeout' WHERE opt_name = 'encryption_session_timeout';

View File

@@ -1 +0,0 @@
module.exports = async () => console.log("heeeelllooo!!!");

View File

@@ -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]);
}
};

View File

@@ -1 +0,0 @@
INSERT INTO options (opt_name, opt_value) VALUES ('encrypted_data_key_iv', '')

View File

@@ -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);
};

View File

@@ -1,5 +0,0 @@
CREATE TABLE `source_ids` (
`source_id` TEXT NOT NULL,
`date_created` INTEGER NOT NULL,
PRIMARY KEY(`source_id`)
);

View File

@@ -1 +0,0 @@
UPDATE notes_tree SET note_pid = 'root' WHERE note_pid = ''

View File

@@ -1 +0,0 @@
DELETE FROM sync;

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`
);

View File

@@ -1 +0,0 @@
UPDATE options SET opt_name = 'start_note_tree_id' WHERE opt_name = 'start_node';

View File

@@ -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
);

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'

View File

@@ -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
);

View File

@@ -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`
);

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');

View File

@@ -1 +0,0 @@
DROP TABLE audit_log;

View File

@@ -1 +0,0 @@
ALTER TABLE notes_tree ADD COLUMN `prefix` TEXT

View File

@@ -1,2 +0,0 @@
DROP TABLE IF EXISTS links;
DROP TABLE IF EXISTS images;

View File

@@ -1 +0,0 @@
SELECT 1;

View File

@@ -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';

View File

@@ -1 +0,0 @@
UPDATE options SET opt_name = 'start_note_path' WHERE opt_name = 'start_note_tree_id';

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`
);

View File

@@ -1,5 +0,0 @@
DROP index IDX_notes_tree_note_tree_id;
CREATE INDEX `IDX_notes_tree_note_id` ON `notes_tree` (
`note_id`
);

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;

View File

@@ -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');

View File

@@ -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');

View File

@@ -1 +0,0 @@
UPDATE options SET opt_value = (SELECT MAX(id) FROM sync) WHERE opt_name = 'last_synced_push';

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');

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)
);

View File

@@ -1,29 +0,0 @@
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),
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, parent_note_id, note_position, 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`
);

View File

@@ -1,28 +0,0 @@
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,
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, parent_note_id, note_position, 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`
);

View File

@@ -1,34 +0,0 @@
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, 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
);

View File

@@ -1,6 +0,0 @@
DROP INDEX IDX_notes_tree_note_id_parent_note_id;
CREATE UNIQUE INDEX `IDX_notes_tree_note_id_parent_note_id` ON `notes_tree` (
`note_id`,
`parent_note_id`
);

View File

@@ -1,9 +0,0 @@
DROP INDEX IDX_notes_tree_note_id_parent_note_id;
CREATE INDEX `IDX_notes_tree_note_id_parent_note_id` ON `notes_tree` (
`note_id`,
`parent_note_id`
);
-- dropping this as it's just duplicate of primary key
DROP INDEX IDX_notes_tree_note_tree_id;

View File

@@ -1,11 +0,0 @@
CREATE TABLE images
(
image_id TEXT PRIMARY KEY NOT NULL,
format TEXT NOT NULL,
checksum TEXT NOT NULL,
name TEXT NOT NULL,
data BLOB,
is_deleted INT NOT NULL DEFAULT 0,
date_modified TEXT NOT NULL,
date_created TEXT NOT NULL
);

View File

@@ -1,16 +0,0 @@
DROP TABLE images;
CREATE TABLE images
(
image_id TEXT PRIMARY KEY NOT NULL,
note_id TEXT NOT NULL,
format TEXT NOT NULL,
checksum TEXT NOT NULL,
name TEXT NOT NULL,
data BLOB,
is_deleted INT NOT NULL DEFAULT 0,
date_modified TEXT NOT NULL,
date_created TEXT NOT NULL
);
CREATE INDEX images_note_id_index ON images (note_id);

View File

@@ -1,27 +0,0 @@
DROP TABLE images;
CREATE TABLE images
(
image_id TEXT PRIMARY KEY NOT NULL,
format TEXT NOT NULL,
checksum TEXT NOT NULL,
name TEXT NOT NULL,
data BLOB,
is_deleted INT NOT NULL DEFAULT 0,
date_modified TEXT NOT NULL,
date_created TEXT NOT NULL
);
CREATE TABLE notes_image
(
note_image_id TEXT PRIMARY KEY NOT NULL,
note_id TEXT NOT NULL,
image_id TEXT NOT NULL,
is_deleted INT NOT NULL DEFAULT 0,
date_modified TEXT NOT NULL,
date_created TEXT NOT NULL
);
CREATE INDEX notes_image_note_id_index ON notes_image (note_id);
CREATE INDEX notes_image_image_id_index ON notes_image (image_id);
CREATE INDEX notes_image_note_id_image_id_index ON notes_image (note_id, image_id);

View File

@@ -1,12 +0,0 @@
CREATE TABLE attributes
(
attribute_id TEXT PRIMARY KEY NOT NULL,
note_id TEXT NOT NULL,
name TEXT NOT NULL,
value TEXT,
date_created TEXT NOT NULL,
date_modified TEXT NOT NULL
);
CREATE INDEX attributes_note_id_index ON attributes (note_id);
CREATE UNIQUE INDEX attributes_note_id_name_index ON attributes (note_id, name);

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