zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-01-15 19:51:57 +08:00
Code Issues Projects Releases Packages Wiki Activity
4952 commits 38 branches 306 tags 138 MiB
Commit graph

4952 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
42b5437c87 fix setup new document, closes #2368 2021-11-21 13:44:52 +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
7a383a1314 create tray only for main window, not setup window 2021-11-20 12:52:23 +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
b7efc92099 frontend library updates 2021-11-15 22:28:56 +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
Myzel394
fcc0a80f4e
Add tray (#2325) 
* copied tray from old thread

* added visibility changer to tray
 2021-11-14 13:36:39 +01:00
zadam
8996f35cc0 Merge remote-tracking branch 'origin/next49' 2021-11-14 13:18:13 +01:00
zadam
ed5eb5c6db fix dockerfile APK python dependency 2021-11-14 11:35:10 +01:00
zadam
acb50f44a1 release 0.48.6 2021-11-13 22:49:58 +01:00
zadam
c946030106 slowndown note map for small note counts to mitigate drift 2021-11-13 22:48:30 +01:00
zadam
df0411197b fixed syncing of erased notes, closes #2316 2021-11-12 21:19:23 +01:00
zadam
600c16551a fixed jsdoc script API generation, closes #2313 2021-11-10 21:30:54 +01:00
zadam
5710c9e997 extra init check to provide better error response 2021-11-10 21:12:53 +01:00
Myzel394
550a9fa711
fixed button background (#2310) 
* fixed button background

* fixed width
 2021-11-09 21:26:38 +01:00
zadam
51348cfbad don't show hidden subtree in autocomplete, fixes #2301 2021-11-04 22:27:39 +01:00
zadam
7400a6723e fix ribbon tab not appearing 2021-11-04 22:21:49 +01:00