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

4233 commits

Author SHA1 Message Date
zadam 0917fc8be1 log messages now contain script context if available 2022-02-01 22:25:38 +01:00
zadam 6833959f3b added regular DB optimization 2022-02-01 21:36:52 +01:00
zadam 398376108d added integrity check button into advanced options. 2022-02-01 21:22:43 +01:00
zadam 61aa029582 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
 2022-02-01 21:04:17 +01:00
zadam 46eaa63625 focus promoted/owned attributes input after activating the ribbon tab, closes #2606 2022-02-01 20:24:58 +01:00
zadam 1b54596c5e tweaks to handling of branch removal 2022-01-31 22:09:39 +01:00
zadam 2feb778d8d Merge remote-tracking branch 'origin/stable' 2022-01-31 21:25:37 +01:00
zadam 2075e89239 improved logging 2022-01-31 21:25:18 +01:00
zadam be44431fde fix setting becca's dateModified after marking as deleted 2022-01-30 13:18:22 +01:00
zadam 99cc4078c6 fix setting becca's utcDateModified after marking as deleted 2022-01-30 13:17:40 +01:00
zadam efd8556129 release 0.50.0-beta 2022-01-19 20:24:54 +01:00
zadam b10a76f150 release 0.50.0-beta 2022-01-19 20:14:40 +01:00
zadam 3055ed86ec Merge remote-tracking branch 'origin/stable' 2022-01-17 23:48:44 +01:00
zadam 4fc3305080 Merge branch 'generateanonymize-script' 
# Conflicts:
#	package-lock.json
#	src/services/builtin_attributes.js
 2022-01-17 23:48:30 +01:00
zadam d1b39ee8fa generate anonymization script into a file 2022-01-17 23:47:26 +01:00
zadam 52b118df7f add #shareRoot label to define an "index" note, closes #2567 2022-01-17 23:13:56 +01:00
zadam a97a7cdcdd fix note title refreshing with old state when user quickly skips to content and starts editing, closes #2566 2022-01-17 20:54:57 +01:00
zadam 1aff3db81f Merge remote-tracking branch 'origin/master' 2022-01-16 22:17:10 +01:00
zadam fc89e098b1 Merge remote-tracking branch 'origin/stable' 2022-01-16 22:16:49 +01:00
Mirwaisse Djanbaz 64172a7f6b
Get file extension before clipping file name (#2562) 
I think this fixes https://github.com/zadam/trilium/issues/2131
 2022-01-15 22:35:54 +01:00
zadam 66a6c76552 generate anonymization script WIP 2022-01-15 22:09:51 +01:00
zadam c8884f1917 don't export hidden subtree to ZIP, fixes #2555 2022-01-15 09:04:44 +01:00
zadam 4933b901f6 Merge remote-tracking branch 'origin/stable' 2022-01-14 21:53:00 +01:00
zadam b679f4218d release 0.49.5 2022-01-14 21:40:37 +01:00
zadam 77c6c4617b changed shared_info class names to avoid conflict with adblocker, closes #2546 2022-01-14 21:23:10 +01:00
zadam 8240a208dd fixed wrong cherry pick 2022-01-14 21:05:39 +01:00
zadam 1c34f73f61 print should include promoted attributes, #2550 
(cherry picked from commit a5444fd6ad)
 2022-01-14 21:03:21 +01:00
zadam a5444fd6ad print should include promoted attributes, #2550 2022-01-14 21:02:11 +01:00
zadam 6fbd5a77e4 forgotten note_types 2022-01-14 19:53:59 +01:00
zadam 742ec44f55 Merge remote-tracking branch 'origin/stable' 2022-01-13 21:53:57 +01:00
zadam 7495777d97 make getAncestors safe in respect to saved search 2022-01-13 21:28:51 +01:00
zadam da4f26d7ce Merge remote-tracking branch 'origin/stable' 2022-01-13 20:32:37 +01:00
zadam fa2ffd7574 ignore "Sync not configured" message when toggling shared state 2022-01-13 20:22:50 +01:00
zadam 2248d98cc7 using 201 for created entities in etapi 2022-01-12 21:14:12 +01:00
zadam ce046b2e20 small dark theme tweaks 2022-01-12 20:13:11 +01:00
zadam 4f4cbccf08 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
 2022-01-12 19:54:11 +01:00
zadam 412c745e53 prevent infinite recursion when checking shared status 2022-01-12 19:46:40 +01:00
zadam 28df5d4aa2 etapi improvements and more tests 2022-01-12 19:32:23 +01:00
zadam 42e85aefdc sync fixes 2022-01-10 21:24:07 +01:00
zadam 91e78998d1 unified Jump-To and quick search behavior with regards to hoisting and opening in a new tab 2022-01-10 20:44:59 +01:00
zadam 6f406f9aa2 search immediately when user chooses "full search" from Jump To dialog, #2483 2022-01-10 20:37:33 +01:00
zadam 916ff5f2ee Merge remote-tracking branch 'origin/next50' 2022-01-10 19:53:36 +01:00
zadam 913d2c06f3 start sync immediately after sharing/unsharing, fixes #2539 2022-01-10 17:15:21 +01:00
zadam cbb5b31f72 Merge remote-tracking branch 'origin/master' into next50 2022-01-10 17:09:40 +01:00
zadam 91dec23d5e ETAPI auth, spec improvements etc. 2022-01-10 17:09:20 +01:00
zadam d04d356429 release 0.49.4 2022-01-09 22:32:13 +01:00
zadam be59f248e8 fix sync skipping some changes and then forcing sector queuing 2022-01-09 22:22:13 +01:00
zadam 2d2641dbd7 sync fixes 2022-01-09 21:25:15 +01:00
zadam 96f4230bc1 Merge branch 'master' into next50 
# Conflicts:
#	src/public/app/widgets/containers/root_container.js
#	src/services/app_info.js
 2022-01-09 20:18:30 +01:00
zadam 7159b13c9d add memberId to entity_changes to avoid having to resend all changes second time 2022-01-09 20:16:39 +01:00
zadam f2732bcab7 fix display of children notes in an empty note, closes #2536 2022-01-09 09:12:21 +01:00
zadam 0e9d76890b use #shareAlias in parent link, closes #2535 2022-01-09 09:04:21 +01:00
zadam d4d48f3834 use [protected] for protected notes in the export 2022-01-08 21:50:16 +01:00
zadam b90ba3d1a9 create note from API/import etc. should allow empty title, fixes #2530 2022-01-08 19:33:56 +01:00
zadam c448d34a38 ETAPI WIP 2022-01-08 19:30:46 +01:00
zadam c33bc7e12c ETAPI search endpoint 2022-01-08 13:18:12 +01:00
zadam c5366abf75 ETAPI put content 2022-01-08 12:01:54 +01:00
zadam 2532ea525d ETAPI openapi spec WIP 2022-01-07 23:06:04 +01:00
zadam 9ee1c9f3da ETAPI delete/patch, refactoring 2022-01-07 19:33:59 +01:00
zadam 82ba0d5b1d release 0.49.3 2022-01-06 23:09:17 +01:00
zadam e6f3cc7988 fix migration from 0.47, closes #2514 2022-01-05 20:21:24 +01:00
zadam 7a650c605c fix typo in the log, closes #2513 2022-01-05 19:48:18 +01:00
zadam dfa7c64b1f fix setting note/mime on root container during note change 2022-01-05 19:28:36 +01:00
zadam 82b2871a08 added date services to ETAPI 2022-01-05 19:25:17 +01:00
zadam e3114e0602 etapi fixes + basic test 2022-01-04 23:00:59 +01:00
zadam e8acf3f9f3 Merge branch 'master' into next50 
# Conflicts:
#	package-lock.json
 2022-01-04 22:11:00 +01:00
zadam 2b10023055 electron update 2022-01-04 22:10:35 +01:00
zadam e25a904a84 ETAPI - post services WIP 2022-01-03 23:13:51 +01:00
zadam dcba6ad70d ETAPI (external API) initial read only access 2022-01-03 22:40:01 +01:00
zadam ffdd917717 Merge branch 'master' into next50 2022-01-03 20:10:48 +01:00
Matt 168645cce9
Style shared note children (#2505) 2022-01-03 19:53:42 +01:00
zadam f4c81ecefb fix setting window title when renaming notes 2022-01-03 19:52:24 +01:00
zadam 5a85fe92aa release 0.49.2-beta 2022-01-02 22:43:30 +01:00
zadam feffd57f24 added support for #pageUrl into shared notes 2022-01-02 22:43:00 +01:00
zadam faf81ae056 fix closing new window, closes #2502 2022-01-02 21:35:02 +01:00
zadam 003fec4b11 fix interrupted initial sync 2022-01-02 21:20:56 +01:00
zadam 5ecb603e86 sharing fixes 2022-01-01 22:32:38 +01:00
zadam 1fed71a92e shaca now loads attributes, added favicon and shareJs 2022-01-01 13:23:09 +01:00
zadam dad82ea4e8 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package.json
#	src/services/build.js
 2021-12-31 20:16:31 +01:00
zadam a38ccde8bc protect tree will check if password is set and send user to options if not 2021-12-30 23:55:36 +01:00
zadam 8120f1bf25 resetting/setting password from options 2021-12-30 22:54:08 +01:00
zadam 067251861d Merge remote-tracking branch 'origin/stable' into stable 2021-12-30 21:06:52 +01:00
zadam 6bc8773d5f handle OPML with empty content, fixes #2495 2021-12-30 21:06:45 +01:00
zadam f92016f9ec set password from web trilium 2021-12-29 23:37:12 +01:00
zadam 4e31af8c84 set password WIP 2021-12-29 23:19:05 +01:00
zadam 7e48d214ca removed username/password from setup 2021-12-28 22:59:38 +01:00
Matt a910034c96
Fix math rendering (#2487) 2021-12-28 20:12:02 +01:00
zadam 257cc66f62 ignore missing image notes when downloading/replacing images, #2486 2021-12-28 20:08:17 +01:00
zadam 00f24bdb63 share improvements 2021-12-28 13:57:37 +01:00
zadam fada3fe623 share improvements 2021-12-28 13:40:51 +01:00
zadam d97e454463 allow cloning into notes, not just branches, fixes #2484 2021-12-27 23:39:46 +01:00
zadam 3128a7d62f various tweaks to shared notes 2021-12-27 20:48:14 +01:00
zadam b8fe9a41db fix consistency checks 2021-12-27 13:37:51 +01:00
Matt 8366a94bde
Various share page improvements (#2471) 
* Add clientside mermaid chart rendering

Merry Christmas :)

* Add katex math rendering client-side

* Update page.ejs

* Revert (wrong branch)

* Add children nodes to all notes under hr

* Add parent note button

* Add note type in child note info

* Fix parent, relative paths

* Add code rendering, fix space in HTML class
 2021-12-27 13:27:00 +01:00
zadam f56123b864 fix missing branch in case of out-of-order clones, closes #2464 2021-12-26 23:31:54 +01:00
DHMike57 ae951bfe23
Add option for vim keymap in codemirror (#2475) 2021-12-26 13:24:18 +01:00
zadam ad8d35efe9 release 0.49.1-beta 2021-12-24 23:05:10 +01:00
zadam 0217b1c85d share pdf view is responsive 2021-12-24 22:46:55 +01:00
zadam c0aa14f586 Merge remote-tracking branch 'origin/master' 2021-12-24 22:43:25 +01:00
zadam b54cfab4ff share root itself is not shared, fixes #2468 2021-12-24 22:43:12 +01:00
Matt a08985e7a6
Display PDF in shared notes (#2466) 
* Add PDF rendering

* Cleanup
 2021-12-24 22:36:31 +01:00
zadam a789025025 don't show share switch for root and share root notes, #2465 2021-12-24 22:34:15 +01:00
zadam 3f307b117e fix webpack build 2021-12-24 22:18:05 +01:00
zadam a232035d47 fix backlink count 2021-12-24 21:01:36 +01:00
zadam 9d38e9342d moved API docs button to the bottom of a code note 2021-12-24 20:40:27 +01:00
zadam 4bc4b9ade7 release 0.49.0-beta 2021-12-23 23:03:21 +01:00
zadam da050c6369 release 0.49.0-beta 2021-12-23 22:33:49 +01:00
zadam 842c317568 cleanup 2021-12-23 21:08:43 +01:00
zadam 47845930f4 sharing improvements 2021-12-23 20:54:48 +01:00
zadam 972f2f40bf share improvements/cleanup 2021-12-23 12:54:21 +01:00
zadam 265401775b release 0.48.9 2021-12-22 22:39:24 +01:00
zadam 94111c464b changed symbol for shared notes 2021-12-22 16:02:36 +01:00
zadam 94e18dfb7c add symbol to shared notes in the tree 2021-12-22 15:01:54 +01:00
zadam f9709c9c39 added shareOmitDefaultCss label 2021-12-22 11:43:21 +01:00
zadam c0964a4f12 added shareAlias label 2021-12-22 10:57:02 +01:00
zadam bcef8579ce added shareCss relation and shareHiddenFromTree label 2021-12-22 09:36:38 +01:00
zadam 1180be75d1 added 404 error page 2021-12-22 09:10:38 +01:00
zadam 7c885a8b76 sharing WIP 2021-12-21 22:01:06 +01:00
zadam 402e29d6dc Merge remote-tracking branch 'origin/stable' 2021-12-21 16:13:09 +01:00
zadam e7faebfac3 sharing WIP 2021-12-21 16:12:59 +01:00
zadam 10a5773c66 added consistency check to reconcile erased status between entity_changes and data 2021-12-21 14:25:26 +01:00
zadam 1e8472266f small fixes 2021-12-21 13:22:13 +01:00
zadam b30792a3da make sure that the info about periodically erased entities is sent to the frontend 2021-12-21 11:04:41 +01:00
zadam 8b56fb10fd Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
 2021-12-20 22:24:50 +01:00
zadam 26602e8226 focus "jump to note" in new tab when there are no workspaces, #2455 2021-12-20 22:10:21 +01:00
zadam b8eeb0371c fixed bug in search where note with inherited attribute is not matched when the owning note is not matched, #2457 2021-12-20 21:35:12 +01:00
zadam b1c4737e78 fixed search tests 2021-12-20 21:31:44 +01:00
zadam 3860028a9e sharing WIP 2021-12-20 17:30:47 +01:00
zadam 16d97b95af optimized custom script/widget loading 2021-12-19 22:08:52 +01:00
zadam 20465a4f71 allow setting image labels in sender API 2021-12-19 21:56:19 +01:00
zadam 2ff6e50af4 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/public/app/dialogs/options/other.js
 2021-12-19 10:54:30 +01:00
zadam e0378c5064 optimized #keyboardShortcuts retrieval 2021-12-19 10:50:38 +01:00
zadam e29aee1aae use lazy title loading in bookmarks buttons to have decrypted title upon protected session start, #2393 2021-12-19 10:36:48 +01:00
zadam 1aff42f453 fix setting exported file extension when truncated 2021-12-17 22:03:00 +01:00
zadam a098630e09 add default JPG quality if value not in range 2021-12-16 22:10:51 +01:00
zadam 074eb1c02f importing of cloned notes should not depend on ZIP listing order, fixes #2440 2021-12-15 22:36:45 +01:00
zadam 657496ea37 Merge remote-tracking branch 'origin/master' 2021-12-14 21:55:00 +01:00
zadam 034aaa7209 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/public/app/dialogs/options/other.js
 2021-12-14 21:54:38 +01:00
zadam a81ea3771f release 0.48.8 2021-12-13 11:12:31 +01:00
Lake 4ceba8cc6e
Correct "Options change have been saved." (#2436) 2021-12-12 21:08:54 +01:00
zadam d9550dd59b fix "getNoteStartingWith" relic 2021-12-11 14:15:38 +01:00
zadam 97f7fe7b18 set note type/mime in PUT body to avoid http proxy slash reencoding, fixes #2419 2021-12-08 22:36:09 +01:00
zadam a810c08c02 trigger note revisioning saving also on title changes #2426 2021-12-08 21:04:22 +01:00
zadam ab550a1e8d share functionality WIP 2021-12-07 23:03:49 +01:00
zadam 08e8047d8a share functionality WIP 2021-12-06 22:53:17 +01:00
zadam 67da877135 Merge remote-tracking branch 'origin/stable' 2021-12-06 20:57:32 +01:00
zadam 263b7a84bb full text search should look into link URLs as well, closes #2412 2021-12-06 20:54:37 +01:00
zadam 9d18bebb13 "show in full search" closes the quick search dropdown 2021-12-06 20:43:50 +01:00
zadam 2d339dec6b share functionality WIP 2021-12-05 23:10:35 +01:00
zadam b78ab1ee02 boxicons 2.1.1 2021-12-05 21:50:02 +01:00
Myzel394 2f5f116345
Improve tabs background coloring (#2395) 
* improved tabs background coloring

* improvements

* reverted changes

* color improvements

* added light theme
 2021-12-05 13:07:53 +01:00
zadam 64f1671566 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package.json
 2021-12-04 13:48:35 +01:00
zadam 26bcfe5160 fix hidden notes appearing in note map, closes #2403 2021-12-04 13:45:15 +01:00
zadam 89c04e6b6b fix "note paths" ribbon widget for root note 2021-12-04 13:33:31 +01:00
zadam e079359c15 copied links from tree should be reference links 2021-12-04 12:50:02 +01:00
zadam c4ab6b4866 copy action in the tree (or ctrl+c) will also save note links to the clipboard, fixes #2401 2021-12-04 12:45:27 +01:00
zadam 630d9f2e45 backlinks improvements, #2349 2021-12-02 22:00:42 +01:00
zadam bbceb6251a backlinks WIP, #2349 2021-12-01 23:12:54 +01:00
zadam 89f117da5b Merge remote-tracking branch 'origin/stable' 2021-11-30 21:40:55 +01:00
zadam 40fb4ff56b fix for "Today page does not work for 2021-11-20", closes #2359 2021-11-30 21:21:16 +01:00
zadam d64c14482b after removing last promoted attribute, create a blank one, fixes #2388 2021-11-26 23:39:08 +01:00
zadam 61f197dd81 Merge remote-tracking branch 'origin/stable' 2021-11-25 21:36:19 +01:00
zadam 564366861e prevent browser from caching images/files, fixes #2378 2021-11-25 20:24:42 +01:00
zadam 1ee2abcc42 keep some types (e.g. mermaid diagrams) of notes full width 2021-11-24 21:27:55 +01:00
zadam f4242b4096 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/services/app_info.js
 2021-11-24 20:08:34 +01:00
zadam d59542dd6f Merge remote-tracking branch 'origin/master' 2021-11-23 23:09:37 +01:00
zadam 211ff90ee8 add "top" label to keep notes on top, allow sorting by label, #2343 2021-11-23 23:09:29 +01:00
zadam 8c11d022fb release 0.48.7 2021-11-23 21:53:32 +01:00
Myzel394 24210ef80c fixed settings menu (#2374) 
(cherry picked from commit 3f40a52f65)
 2021-11-23 21:38:13 +01:00
Myzel394 3f40a52f65
fixed settings menu (#2374) 2021-11-23 21:37:32 +01:00
zadam df4cf80be4 fix version detection without running npm 2021-11-21 17:20:28 +01:00
zadam bc854ee149 cleanup 2021-11-21 17:15:10 +01:00
Myzel394 b23ead8097
Fix: Highlighting searched term should ignore accents (#2364) 
* fixed accent highlighting not working

* fixed

* fixes

* improvements
 2021-11-21 16:27:50 +01:00
Myzel394 886fdf7cd6
Improve image compression (#2369) 
* added options

* added checkbox handling to import into note

* added image compression option respecting
 2021-11-21 16:27:13 +01:00
zadam 2135aa058e increase sync version to 22 2021-11-21 16:16:28 +01:00
zadam de20183a22 Merge remote-tracking branch 'origin/stable' 2021-11-21 13:45:57 +01:00
zadam 67542f448d fix total height / scrolling on mobile chrome/safari, closes #2367 2021-11-21 13:39:47 +01:00
zadam ae29c6bac4 global note map should respect hoisting, #2365 2021-11-21 10:40:48 +01:00
zadam 1dce96b4c1 Merge remote-tracking branch 'origin/stable' 2021-11-20 21:34:34 +01:00
zadam 08e9b59696 hide hidden subtree notes from search results, closes #2361 2021-11-20 21:01:37 +01:00
jasongwq db9e35a7e1
add quick search in mobile layout (#2360) 
Co-authored-by: jasongwq <jasongwq@126.com>
 2021-11-20 20:55:52 +01:00
zadam fe605c012a fix setting monospace font from theme 2021-11-20 13:20:06 +01:00
zadam 5290aab781 Merge remote-tracking branch 'origin/master' 2021-11-20 12:51:13 +01:00
zadam 86c3bbe5a2 Merge remote-tracking branch 'origin/stable' 2021-11-20 12:50:58 +01:00
zadam 4c7c53d8c8 retry for OpenNoteButtonWidget 2021-11-20 12:49:12 +01:00
Myzel394 21854b4a04
fixed title (#2356) 2021-11-19 13:03:12 +01:00
zadam 83f125a79f cleanup setting of utcDateCreated in branches and options code 2021-11-18 22:39:12 +01:00
zadam e36bc42519 added changeId into entity_changes to have cross-sync change ID 2021-11-18 22:33:08 +01:00
zadam 15ac81627c DB cleanup migration 2021-11-18 21:52:56 +01:00
zadam 57fae2c8c6 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
#	package.json
 2021-11-18 21:36:03 +01:00
zadam 87b76abef9 better-sqlite3 binaries 2021-11-18 21:35:23 +01:00
zadam d345b7ed56 added entity changes check after sync check failure, fixed sync 2021-11-17 22:57:09 +01:00
zadam 298af217e9 fix bug overwriting entity changes 2021-11-17 21:47:41 +01:00
zadam 89322c4b03 upgrade to electron v16 and node v16 2021-11-16 22:43:08 +01:00
zadam 7d64f6a7dd increment lastProcessedEntityChangeId correctly 2021-11-16 22:12:53 +01:00
zadam bc8b6284a6 fix exporting root note, closes #2346 
(cherry picked from commit 20a187fab9)
 2021-11-15 21:28:12 +01:00
zadam 20a187fab9 fix exporting root note, closes #2346 2021-11-15 21:23:19 +01:00
zadam 0b001f41c0 improvements/simplification to the update check 2021-11-14 21:52:18 +01:00
zadam 242977c7a5 cleanup after update check merge 2021-11-14 13:45:37 +01:00
Myzel394 364ac331da
Add update available box (#2329) 
* current stand

* added update available button

* improved update available icon

* improved update available box

* adding server side version

* added backend

* fixed text

* added option handling

* added field disabling

* removed options

* fixed terminology

* removed unnecessary imports
 2021-11-14 13:42:50 +01:00