sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,443 Commits
21 Branches
339 Tags
369 MiB
Commit Graph

6443 Commits (cc02546ed36c20f980d8388c754ed064dce8e47c)
 

Author SHA1 Message Date
zadam cc02546ed3 Merge remote-tracking branch 'origin/master' into next60 
# Conflicts:
#	src/routes/api/options.js
#	src/services/import/zip.js
#	src/services/options_init.js
 2023-05-07 09:41:33 +07:00
zadam fbea3ed94f
Merge pull request #3901 from Nriver/master 
customize search engine
 2023-05-06 23:02:12 +07:00
zadam 0ab18e3069
Merge pull request #3897 from contributor/feature/ZipExportDocumentTitle 
zip export/import improvements
 2023-05-06 22:52:05 +07:00
zadam 2aa987c072 fixes for zip export/import in regard to attachments 2023-05-06 22:50:28 +07:00
zadam a06ddc439d improving import WIP 2023-05-06 15:07:38 +07:00
zadam f6944b8219 introducing meta types for import/export, fixes for attachments export 2023-05-06 14:38:45 +07:00
zadam fa3cbb4645 grammar 2023-05-05 23:41:11 +07:00
zadam 6dfc72c065 many small fixes from Intellij analysis 2023-05-05 23:17:23 +07:00
zadam 0af6f91d21 exposing blobs in APIs 2023-05-05 22:21:51 +07:00
zadam 5e1f81e53e getting rid of note complement WIP 2023-05-05 16:37:39 +07:00
zadam 9cdcbb3125 fix runOnNoteContentChange event 2023-05-05 15:42:53 +07:00
zadam 35338e9ec6 fix runOnNoteContentChange event 2023-05-05 15:40:44 +07:00
zadam 78d83b8826 fix note size calculation with blobs 2023-05-05 15:18:55 +07:00
zadam 8edf06d28d small refactorings 2023-05-04 22:16:18 +07:00
zadam ecd2a5cbac Merge remote-tracking branch 'origin/master' into next60 2023-05-04 21:01:53 +07:00
zadam c0cf319521 upgrade electron to 25 and node to 18 2023-05-04 21:01:25 +07:00
contributor bb9631476e bump metaFile format version 2023-05-04 19:56:11 +07:00
contributor 386e8dd32e zip import - remove html tags added by Trilium 2023-05-04 19:56:02 +07:00
Nriver 61616f708f add default options for search engine options 2023-05-04 18:01:51 +07:00
Nriver 8ce499e958 add runtime check for search engine options 2023-05-04 16:20:09 +07:00
Nriver 22587ee6b5 customize search engine 2023-05-04 14:57:33 +07:00
zadam 9b32d86f78 take branch prefix into account while sorting, fixes #3896 2023-05-03 23:42:44 +07:00
zadam 5ea8226996
Merge pull request #3777 from PhilippOesch/#3689 
change downdown border to light border
 2023-05-03 23:25:35 +07:00
zadam fbffc6b2b5 inline attachment images into single HTML export 2023-05-03 23:17:07 +07:00
zadam cd01886eb2 attachment revision upload 2023-05-03 22:49:24 +07:00
contributor bb8fd2b054 zip export - set note title as document.title 2023-05-03 16:19:28 +07:00
zadam d8bc9c2982 attachment actions 2023-05-03 10:23:20 +07:00
zadam d232694dec tree context menu to convert notes into attachments 2023-05-02 23:04:41 +07:00
zadam 735ac55bb8 fixes, allowing conversion of note into an attachment 2023-05-02 22:46:39 +07:00
zadam c9aab9b479
Merge pull request #3893 from mirrorcult/2023-05-01/ensure-note-return-branch 
Return created/existing branch in `EnsureNoteIsPresentInParent`
 2023-05-02 21:12:43 +07:00
Kara 53c87f3d25 Return created/existing branch in `EnsureNoteIsPresentInParent` 2023-05-01 12:41:22 +07:00
zadam 4f1fafdf75
Merge pull request #3870 from soulsands/perf-count 
perf: improve descendant count performance
 2023-04-28 21:53:41 +07:00
zadam 330e7ac08e copying attachments WIP 2023-04-25 00:01:58 +07:00
zadam 49fb913eab erasing unused attachments 2023-04-24 21:22:34 +07:00
zadam 4b074365e7 Merge branch 'master' into next60 2023-04-24 20:21:45 +07:00
zadam 0896000fcd Merge branch 'stable' 2023-04-24 20:21:22 +07:00
Castor e007aba067
Update note_map.js 2023-04-24 13:43:19 +07:00
zadam a6eda2479f
Merge pull request #3871 from soulsands/config-debug 
chore: debugger config for vscode developers
 2023-04-23 22:32:29 +07:00
zadam eff567ee48 wrong password login screen should return 401 so that it counts to the rate limiter, fixes #3867 2023-04-23 22:22:05 +07:00
zadam d3c2c314ac
Merge pull request #3866 from soulsands/custom-match 
fix:  match custom path strictly
 2023-04-23 22:12:55 +07:00
baiyongjie 89681977b5 perf: improve descendant count performance 2023-04-23 15:36:34 +07:00
baiyongjie e10a7ea9a6 chore: debugger config for vscode developers 2023-04-23 15:26:46 +07:00
soulsands c3c6d73bb2 fix: match custom path strictly 2023-04-22 19:37:49 +07:00
zadam 5e2efca933 scheduled erasure of attachments WIP 2023-04-21 00:19:17 +07:00
zadam e71b0d82a1 scheduled attachment deletion WIP 2023-04-20 00:11:09 +07:00
zadam c6c162cdda restore revision with attachments 2023-04-19 22:47:33 +07:00
zadam 8b46d6c718 Merge branch 'stable' into next60 2023-04-19 22:03:44 +07:00
zadam e24d5a6f83 collapse command will collapse the whole tree, including the current active note path, fixes #3664 2023-04-19 21:24:51 +07:00
zadam e28fbf4617 fixes 2023-04-17 23:21:28 +07:00
zadam 0e4a040ed8 fixes of new attachment URLs 2023-04-17 22:40:53 +07:00