zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-11-17 21:21:40 +08:00
Code Issues Projects Releases Packages Wiki Activity
2674 commits 38 branches 306 tags 138 MiB
Commit graph

774 commits

Author SHA1 Message Date
zadam
242bea236f removed link remnants 2019-08-27 21:24:31 +02:00
zadam
36c87b7fa0 renamed "messagingService" to "ws" 2019-08-26 20:21:43 +02:00
zadam
24a3f814ed fix ctrl+enter in sql console 2019-08-25 21:55:36 +02:00
zadam
b84542064c saving of widget configuration 2019-08-22 22:14:01 +02:00
zadam
8ab2c924c4 widget ordering WIP 2019-08-22 20:58:43 +02:00
zadam
b818f020a7 option to configure if sidebar should be enabled in new tab 2019-08-19 23:29:42 +02:00
zadam
9888850c22 resizing sidebar in options 2019-08-19 23:02:19 +02:00
zadam
c9d0b8cc40 link fixes 2019-08-19 20:19:42 +02:00
zadam
3cb421143f Link entity migrated to Attribute, WIP 2019-08-19 20:12:00 +02:00
zadam
fd9b79e115 loading of custom widgets 2019-08-17 11:28:36 +02:00
zadam
61520bc3b3 Merge branch 'stable' 
# Conflicts:
#	package-lock.json
#	package.json
 2019-08-15 08:52:34 +02:00
zadam
5406b09f3a release 0.34.3 2019-08-13 21:48:56 +02:00
zadam
dfa1ab65c6 allow requiring native node modules from backend scripts 2019-08-12 20:41:38 +02:00
zadam
963ed32ce4 allow user to choose theme during initial setup 2019-08-11 10:28:49 +02:00
zadam
de4733e848 updating attributes widget based on sync data changes 2019-08-06 23:20:27 +02:00
zadam
bfbc124e78 widgets can now listen to sync data changes 2019-08-06 22:39:27 +02:00
zadam
6e260ee563 Merge branch 'stable' 2019-08-06 19:28:11 +02:00
zadam
b1075d956f release 0.34.2 2019-08-01 21:37:59 +02:00
zadam
385b79ad34 Merge remote-tracking branch 'origin/t35' 
# Conflicts:
#	src/views/tabs.ejs
 2019-07-28 22:38:02 +02:00
zadam
b8509c487d release 0.34.1 2019-07-28 15:02:36 +02:00
zadam
78ffac8232 logging API auth rejections 2019-07-25 21:05:16 +02:00
zadam
b3834324f6 fix sync proxy with TLS 2019-07-24 20:47:41 +02:00
zadam
ea0835561c option to use node's http client for sync without proxy 2019-07-22 22:46:06 +02:00
zadam
b0c0c5f56b release 0.34.0-beta 2019-07-21 21:57:35 +02:00
zadam
6d5f8e0562 added web clipper to readme 2019-07-20 14:27:36 +02:00
zadam
706fc647ff Merge branch 'stable' 
# Conflicts:
#	package.json
 2019-07-11 22:27:27 +02:00
zadam
13e9f9f9e7 release 0.33.7 2019-07-11 20:55:56 +02:00
zadam
a76dcb44ae improvements in the exported file extensions 2019-07-11 20:54:57 +02:00
zadam
b9373806cf fix doubling of extension 2019-07-11 20:40:40 +02:00
zadam
9de2927304 image import/export related fixes 2019-07-10 23:01:30 +02:00
zadam
c3e1126489 backported image fixes 2019-07-10 20:38:27 +02:00
Xavier NUNN
dcebcb0e73 Add host option (#588) 
* Added option to configure host

* Updated sample config
 2019-07-09 22:50:20 +02:00
zadam
6a99af64a8 added clipper protocol version 2019-07-07 22:27:06 +02:00
zadam
7d57961ab2 make clipper api authenticated for server and unauthenticated for local electron 2019-07-07 13:12:40 +02:00
zadam
a912b2f23d choose port dynamically from range based on environment 2019-07-07 10:49:34 +02:00
zadam
36b581489c saving selections adds to the existing date note instead of creating new one each time 2019-07-06 23:54:48 +02:00
zadam
070e8d9647 Merge branch 'stable' 2019-07-03 20:51:34 +02:00
zadam
6d2394a9da release 0.33.6 2019-07-02 22:26:05 +02:00
zadam
e94669de03 Merge branch 'stable' 2019-07-01 21:36:02 +02:00
zadam
9c91b0459e release 0.33.5 2019-06-30 21:47:04 +02:00
zadam
2f3b256272 Merge branch 'stable' 2019-06-29 20:37:51 +02:00
zadam
c8e4a5c9e7 release 0.33.4 2019-06-26 21:20:30 +02:00
zadam
3851bedb57 Merge branch 't34' 2019-06-26 21:11:27 +02:00
zadam
20d3d61cec release 0.33.3 2019-06-24 20:47:50 +02:00
zadam
174128447b token auth to /login 2019-06-23 21:22:08 +02:00
zadam
5d213eea7e basic webp support 2019-06-23 15:22:05 +02:00
zadam
154a575701 cleanup + context menu clip now works 2019-06-22 19:49:48 +02:00
zadam
70591eadd5 release 0.33.2-beta 2019-06-20 09:39:11 +02:00
zadam
fead3cd7ad fix note export/import/branch prefix to use right-clicked note as opposed to current active 2019-06-20 09:37:18 +02:00
zadam
5c1922ac9f release 0.33.1-beta 2019-06-16 11:13:37 +02:00
zadam
cdd53a39f1 release 0.33.0-beta 2019-06-12 21:45:05 +02:00
zadam
a72eeb9a98 check sync version before setting up the sync, fixes #559 2019-06-11 20:42:06 +02:00
zadam
69e48ff4d7 fix links table reference 2019-06-09 11:16:00 +02:00
zadam
1f3d726048 Merge branch 'stable' 
# Conflicts:
#	package-lock.json
 2019-06-06 21:24:25 +02:00
zadam
547ad7221d release 0.32.4 2019-06-05 22:53:34 +02:00
zadam
97a258c0c6 include sync version in sync seed request, #559 2019-06-05 22:50:03 +02:00
zadam
19a154c2f4 fix direct migration from 0.30 to 0.32, closes #557 2019-06-05 22:07:12 +02:00
zadam
412375e92f import should recognize all suported code note file types, fixes #554 2019-06-05 21:27:07 +02:00
zadam
87b16f3325 link map WIP 2019-06-03 22:55:59 +02:00
zadam
6ef8a4c018 Merge branch 'next' 
# Conflicts:
#	package.json
 2019-06-02 15:22:15 +02:00
zadam
ebd26f85bd release 0.32.3 2019-06-02 14:04:32 +02:00
zadam
d08a36174d attribute sync should trigger note reload, fixes #551 2019-06-01 12:14:09 +02:00
zadam
b0303ef529 updated sqlite binaries for electron 6 / node 12 2019-05-31 18:46:23 +02:00
zadam
883d726622 release 0.32.2-beta 2019-05-29 23:14:59 +02:00
zadam
53a995fecb fix database anonymization 2019-05-29 19:57:50 +02:00
zadam
873b60b00d release 0.32.1-beta 2019-05-27 21:39:43 +02:00
zadam
d614967d62 release 0.32.0-beta 2019-05-22 22:28:35 +02:00
zadam
29828f8e8f fix recent notes (db & sync version increase) 2019-05-21 21:47:28 +02:00
zadam
48b4488a58 deleting a note will close all tabs containing the note 2019-05-20 21:50:01 +02:00
zadam
ecfba95841 calendar root can now have datePattern and monthPattern to define the names 2019-05-19 11:30:17 +02:00
zadam
93c0469aa0 Merge branch 'stable' 
# Conflicts:
#	src/public/javascripts/dialogs/add_link.js
 2019-05-13 21:42:52 +02:00
zadam
75ef766649 fix retrieving "many rows", closes #525 2019-05-13 20:40:00 +02:00
zadam
fab8b77794 configurable hiding of tab row for one tab 2019-05-12 21:45:30 +02:00
zadam
be68391c37 store "openTabs" session 2019-05-10 21:43:40 +02:00
zadam
80fb89b794 release 0.31.5 2019-05-04 20:25:14 +02:00
zadam
47d28b4eef fix protecting files/images 2019-05-04 16:05:28 +02:00
zadam
a9762c5139 fix incorrect switch between protected/unprotected states causing content not being encrypted, fixes #510 2019-05-04 14:46:17 +02:00
zadam
7ce98b0b28 release 0.31.4 2019-05-02 22:25:48 +02:00
zadam
29931bbddf release 0.31.3 2019-04-28 22:58:27 +02:00
zadam
06be593fe4 crash if the DB has newer version than the application 2019-04-23 21:27:45 +02:00
zadam
f7dd3558a7 release 0.31.2-beta 2019-04-22 22:53:04 +02:00
zadam
f273b4334e implemented @limit for search 2019-04-22 18:08:33 +02:00
zadam
1990c9399e removed FTS5 completely 2019-04-21 12:03:13 +02:00
zadam
151641b659 fulltext search now doesn't use FTS5, closes #489 2019-04-21 11:54:13 +02:00
zadam
36c6376220 create trilium data directory if it doesn't exist, closes #491 2019-04-21 09:05:55 +02:00
zadam
064a11d872 don't allow deleting hoisted note + other related fixes, closes #488 2019-04-16 21:40:04 +02:00
zadam
8da8dfc543 if the resized and optimized image is larger than original, then keep the original 2019-04-15 21:12:47 +02:00
zadam
147d79c65c release 0.31.1-beta 2019-04-14 21:18:22 +02:00
zadam
47cb7c7f5e not refreshing tree after sort operation because it messes with everything ... 2019-04-14 18:32:56 +02:00
zadam
751bf94758 don't change sourceId for script execution which forces full tree reloads because it is annoying 2019-04-13 19:45:50 +02:00
zadam
4b934a4a81 fix sync / fulltext issue 2019-04-13 19:34:19 +02:00
zadam
7e374e795b fill sync rows to fix sync issues 2019-04-13 10:30:16 +02:00
zadam
be378f71b0 sync checks for note_contents 2019-04-13 10:13:47 +02:00
zadam
ae8f4ffbbe minor sync fix for fulltext 2019-04-11 21:44:35 +02:00
zadam
83b4382787 missing cert and key error message 2019-04-08 20:08:29 +02:00
zadam
ef1b32d586 search error handling & sanitize input for default fulltext 2019-04-02 22:52:42 +02:00
zadam
2259e1d44d make sure to wait for DB connection to be up before starting ... 2019-04-02 19:42:41 +02:00
zadam
2978a262f7 release 0.31.0-beta 2019-04-01 21:50:32 +02:00
zadam
a4c8bdeda2 fix decryption of protected note revisions 2019-03-31 22:54:38 +02:00
zadam
5bda254184 allow searching with noteId & fix combining fulltext and other conditions with OR 2019-03-31 22:23:50 +02:00
zadam
f00e1235f9 tar import can now process files with out of order directories 2019-03-31 18:53:29 +02:00
zadam
51bede6541 fix detection of sync connection issue with new error code 2019-03-31 18:36:12 +02:00
zadam
75dbaa4b77 fix csrf protection on electron build 2019-03-31 12:49:42 +02:00
zadam
bec6576620 fix note cleanup 2019-03-31 11:27:19 +02:00
zadam
7cafbda7cd migration for inconsistent isProtected status across notes and note_contents 2019-03-30 22:12:18 +01:00
zadam
9a5a085103 Merge branch 'stable' 
# Conflicts:
#	package-lock.json
#	src/public/javascripts/services/server.js
#	src/services/app_info.js
#	src/services/notes.js
 2019-03-30 22:11:03 +01:00
zadam
cdb17ae937 release 0.30.7 2019-03-30 20:13:53 +01:00
zadam
c240fb9896 migration for inconsistent isProtected status across notes and note_contents 2019-03-30 20:09:38 +01:00
zadam
4b41eddf44 fix creating note directly as protected 2019-03-30 19:24:53 +01:00
zadam
b51ac112a2 fix loading of protected session in electron, #469 2019-03-30 18:00:08 +01:00
zadam
0f32154b91 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/public/javascripts/services/context_menu.js
 2019-03-29 23:37:36 +01:00
zadam
89b8e2bb08 redesign of search input. Saved search is now saved under active note and doesn't need page reload 2019-03-29 23:24:41 +01:00
zadam
8fb6edad67 fix consistency checks for fulltext 2019-03-29 22:08:04 +01:00
zadam
c2e3a3fe04 release 0.30.6 2019-03-28 23:17:24 +01:00
zadam
b2052a6ccd release 0.30.6 2019-03-28 23:01:52 +01:00
zadam
a07479cd5a release 0.30.6 2019-03-28 22:49:34 +01:00
zadam
3820384f51 release 0.30.6 2019-03-28 22:35:43 +01:00
zadam
efac7701eb release 0.30.6 2019-03-28 22:31:59 +01:00
zadam
946dae72d9 implemented consistency check for note fulltext based on hashes 2019-03-27 21:27:29 +01:00
zadam
07e9013152 content migration fixes 2019-03-27 21:04:25 +01:00
zadam
29c60581a6 yet another refactoring of working with note's payload/content 2019-03-26 22:24:04 +01:00
zadam
4bdcf32475 repository now uses upsert instead of insert/replace 2019-03-25 22:06:17 +01:00
zadam
3311c6336c exposed searchForNotes to backend script API 2019-03-20 22:51:13 +01:00
zadam
fc13e1fa6a added possibility to search by attached script returning note ids + some refactorings 2019-03-20 22:28:54 +01:00
zadam
0267468cd5 deleting without reloading the whole tree (at least on frontend) 2019-03-18 23:03:41 +01:00
zadam
ca0d17d93a cloning is now done without reloading the whole tree 2019-03-18 22:33:19 +01:00
zadam
33f2aaa650 note type context submenu now works end to end 2019-03-17 12:19:23 +01:00
zadam
177caec011 note type context submenu WIP 2019-03-17 11:38:27 +01:00
zadam
62650a4545 refactoring of router search code into service 2019-03-16 22:19:01 +01:00
zadam
81dc907afc ordering of search results 2019-03-16 20:52:21 +01:00
zadam
3ee33e1024 refactoring of joins for search 2019-03-16 19:57:39 +01:00
zadam
2326eb85f1 filter reimplementation, WIP 2019-03-16 16:52:58 +01:00
zadam
0885e60b80 removed obsolete isoDateXXX API methods 2019-03-14 20:49:10 +01:00
zadam
ef40c66344 renamed currentNote to activeNote to be consistent with frontend API 2019-03-14 20:21:27 +01:00
zadam
0d0464549f notes are now created with correct local dates 2019-03-13 22:43:59 +01:00
zadam
b68b0fe783 Merge branch 'master' into dev31 2019-03-13 21:53:41 +01:00
zadam
b4c6d9f800 using now session cookies to store protectedSessionId 2019-03-13 21:53:09 +01:00
zadam
24c8b39d8e release 0.30.5 2019-03-12 22:21:35 +01:00
zadam
1c41d459f0 renamed dates in code as well 2019-03-12 20:58:31 +01:00
zadam
f65fefe7b1 migration utc dates 2019-03-11 22:58:44 +01:00
zadam
dd9b7bbbb5 fix fulltext search 2019-03-11 19:50:13 +01:00
zadam
d25a1e3ed9 initial work on note fulltext (schema changes, updating...) 2019-03-10 17:02:23 +01:00
zadam
05374becfd Merge branch 'master' into dev31 2019-03-10 10:11:01 +01:00
zadam
a432ad7483 fix isProtected consistency for images and files + related consistency check 2019-03-08 22:25:12 +01:00
zadam
ae17e4dc60 release 0.30.4 2019-03-07 22:40:05 +01:00
zadam
02eddc347a fix export of protected notes to tar archive, fixes #432 2019-03-07 22:00:23 +01:00
zadam
fe86c09f22 make sure date label is always created with YYYY-MM-DD and not the rest of date time 2019-03-05 20:49:39 +01:00
zadam
fd0bd5dd00 small fixes 2019-03-05 20:38:31 +01:00
zadam
cd6d4fb527
Merge pull request #420 from jkurei/master 
Querying by dateCreated and dateModified virtual attributes
 2019-03-05 19:47:17 +01:00
zadam
7c404f03db unused param 2019-03-04 22:18:27 +01:00
zadam
ed1cf6aad5 fix passing of startNote and originEntity to backend script API 2019-03-04 21:17:34 +01:00
zadam
b48474998b release 0.30.3-beta 2019-03-03 20:47:50 +01:00
zadam
95d8f07458 debugging info for image shrinking 2019-03-03 20:41:03 +01:00
zadam
e628c30c89 fix OPML export to include correct OPML version 2019-03-03 19:43:30 +01:00
zadam
54b5898582 detect mime types from the filename instead of relying on upload mime type 2019-03-03 00:25:31 +01:00
zadam
64974d75d5 added sync fill for note_contents 2019-03-02 19:59:32 +01:00
zadam
bd118027fb note content is also part of hash check 2019-03-02 12:40:46 +01:00
zadam
36de217835 release 0.30.2-beta 2019-02-28 22:33:33 +01:00
zadam
8414d97ffa improve logging a little bit 2019-02-27 22:15:52 +01:00
zadam
003eed368b unify markdown mime to text/x-markdown 2019-02-25 21:57:11 +01:00
zadam
4b1cf05c0e import images 2019-02-25 21:22:57 +01:00
zadam
d9429c4f4b import plain text file as text/html 2019-02-24 13:10:47 +01:00
zadam
b7bd94b6b0 switchable image shrinking 2019-02-24 12:25:34 +01:00
zadam
51bbc10744 switchable image shrinking 2019-02-24 12:24:28 +01:00
zadam
886ea6c68c allow import of multiple files at the same time 2019-02-24 09:34:50 +01:00
jkurei
ec384fafce Querying by dateCreated and dateModified virtual attributes 2019-02-24 01:34:23 +01:00
zadam
b25deea21d fixes for relative paths 2019-02-22 23:03:20 +01:00
zadam
6f956c2415 release 0.30.1-beta 2019-02-20 23:08:36 +01:00
zadam
3533160bef fix initial document setup 2019-02-20 23:07:57 +01:00
zadam
dd4f3ec264 release 0.30.0-beta 2019-02-20 21:58:31 +01:00
zadam
1d5fb0b646 add possibility to create week note, closes #416 2019-02-19 22:49:57 +01:00
zadam
80931a318f exposing APIs to get month and year note, #416 2019-02-19 21:29:41 +01:00
zadam
a7fce33750 OPML v2 export 2019-02-16 23:58:42 +01:00
zadam
6fd8e73150 UI for export of OPML v2, WIP 2019-02-16 23:33:40 +01:00
zadam
1359dd86c2 OPML 2 import, closes #298, #286 2019-02-16 22:13:29 +01:00
zadam
22228de63b sync changes for note content 2019-02-15 00:15:09 +01:00
zadam
6c927d9159 Merge remote-tracking branch 'origin/note-content' 2019-02-12 21:14:42 +01:00
zadam
ddc79b2517 release 0.29.1 2019-02-12 20:30:07 +01:00
zadam
14f7a8b7b9 safe import implementation 2019-02-11 23:45:58 +01:00
zadam
caa7dd9619 prettier progress count 2019-02-10 22:56:14 +01:00
zadam
8aa7e2d0a0 fixes in opml export and note content loading 2019-02-10 22:45:44 +01:00
zadam
6be8a3f343 added progress also to export 2019-02-10 22:30:55 +01:00
zadam
a097cefba7 import error handling 2019-02-10 19:53:57 +01:00
zadam
e4c78f3887 added ImportContext 2019-02-10 19:36:03 +01:00
zadam
5baa251944 more changes to import reporting through WS 2019-02-10 16:59:50 +01:00
zadam
cde68abec9 progress of tar import through WS 2019-02-10 16:36:25 +01:00
zadam
45ddfef30a new import dialog 2019-02-10 14:33:13 +01:00
zadam
4a093000be note content refactoring, WIP 2019-02-08 21:01:26 +01:00
zadam
6952b643ae note content refactoring, WIP 2019-02-07 22:16:40 +01:00
zadam
c487a95bc7 note content refactoring, WIP 2019-02-06 21:29:23 +01:00
zadam
8884177d9f split out note's content into separate entity, WIP 2019-02-06 20:19:25 +01:00
zadam
d8b78d8025 check reference issues only for non deleted entities 2019-02-03 16:27:26 +01:00
zadam
42112b8053 fix consistency check 2019-02-03 16:22:45 +01:00
zadam
6cc0dd5a80 release 0.29.0-beta 2019-02-03 15:44:19 +01:00
zadam
6a67cdd5af appThemeClass is redundant 2019-02-03 15:35:37 +01:00
zadam
bad7b84993 error handling in custom request handler 2019-02-03 11:15:32 +01:00
zadam
c08524c977 fix CSS class of user theme 2019-02-03 00:12:57 +01:00
zadam
f89537037e small styling fixes 2019-02-02 23:51:00 +01:00
zadam
0aec5927d5 added missing labels customRequestHandler, customResourceProvider to autocomplete 2019-02-02 22:33:02 +01:00
zadam
89344a6eda final fixes and refactorings for consistency checks 2019-02-02 12:41:20 +01:00