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

232 Commits (15a11daf381b399024bf8708f662b94c868c1f3d)

Author SHA1 Message Date
zadam 15a11daf38 Merge branch 'master' into next60 
# Conflicts:
#	package-lock.json
#	package.json
 2023-04-10 18:52:30 +07:00
MeIchthys 8a4caaf6fb
Add border to tree-actions section and adjust padding 2023-03-24 15:17:17 +07:00
MeIchthys fa6d1879dd
Move .tree-actions left to accomodate wider windows scrollbar 2023-03-24 14:46:09 +07:00
zadam 0b270ee87a remove "hide included images" feature since with attachments it's no longer necessary 2023-03-24 09:17:17 +07:00
zadam e411ad0eb1 Merge branch 'master' into dev 2023-02-13 15:58:02 +07:00
zadam 17085e5578 fix hidden subtree appearing after collapse, #2922 2023-02-13 15:09:57 +07:00
zadam 15607becc6 Merge branch 'master' into dev 
# Conflicts:
#	package-lock.json
#	src/public/app/entities/fnote.js
#	src/services/notes.js
 2023-02-02 23:35:41 +07:00
zadam 2e181d0fb1 toggling the left pane will toggle the focus between tree and detail, #3563 2023-01-31 22:35:01 +07:00
zadam 6a6ae359b6 Merge branch 'master' into dev 
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/widgets/dialogs/note_revisions.js
#	src/services/handlers.js
#	src/services/hidden_subtree.js
#	src/services/search/services/parse.js
 2023-01-17 22:20:10 +07:00
zadam f50a9c250a many small issues found by intellij analysis 2023-01-15 21:04:17 +07:00
zadam 9479f1c1a1 toggling archived notes caused appearance of hidden subtree, fixes #3519 2023-01-13 11:25:58 +07:00
zadam 4ab90b694f fix 2023-01-09 23:15:02 +07:00
zadam 87636f27ba Merge branch 'master' into dev 
# Conflicts:
#	src/routes/api/sender.js
#	src/services/import/enex.js
 2023-01-09 23:02:19 +07:00
zadam 571cb6d0eb fix dynamic module import 2023-01-09 22:32:49 +07:00
zadam 8a641e1b4f added "inherit" relation, #3493 2023-01-06 20:31:55 +07:00
zadam d7cae7d5bb improvements in API docs generation 2023-01-05 23:38:41 +07:00
zadam ac51d0d569 Merge branch 'master' into dev 
# Conflicts:
#	package-lock.json
#	package.json
 2023-01-05 16:17:33 +07:00
zadam 034098fd06 don't use alert, #3483 2023-01-05 15:23:22 +07:00
zadam 977a47bc27 rename froca entities to have F-prefix, #3476 2023-01-03 13:35:10 +07:00
zadam f809da58ec fix occurrences of 'root' branch 2022-12-28 13:09:49 +07:00
zadam c5fb2cccd5 fix bookmark's ID 2022-12-24 12:26:32 +07:00
zadam 1d1e6ae782 disallow dropping notes before/after available/visible launchers 2022-12-24 07:22:05 +07:00
zadam 46f40ee534 fix options 2022-12-22 22:52:04 +07:00
zadam a882ad41c5 small fixes 2022-12-22 21:01:52 +07:00
zadam 724f99f17c add prefix "_" to "named" IDs 2022-12-21 16:11:00 +07:00
zadam 1b24276a4a always use template strings instead of string concatenation 2022-12-21 15:19:05 +07:00
zadam d34a0a9fc0 hidden subtree is not archived anymore 2022-12-16 16:00:49 +07:00
zadam 4026c2be4f Merge branch 'next58' 
# Conflicts:
#	src/public/app/widgets/note_tree.js
#	src/services/tree.js
 2022-12-14 23:48:58 +07:00
zadam c4b0c44919 change of archived label should force a reload of the parents since it can change its visibility status, fixes #3422 2022-12-14 19:26:39 +07:00
zadam 75639c53f0 unhoist button on the left 2022-12-14 10:18:29 +07:00
zadam ca968a9e31 hoisting support in mobile view WIP 2022-12-13 16:57:46 +07:00
zadam 2957e1d78a improvements in mobile layout for launchbar 2022-12-12 23:48:34 +07:00
zadam c1d4d3fc8a mobile layout improvements 2022-12-11 21:27:03 +07:00
zadam dcfa9c4c0b mobile layout has floating buttons 2022-12-11 13:54:12 +07:00
zadam dfb462cf35 introduced new exception classes for structured error reporting 2022-12-09 16:13:22 +07:00
zadam 342ae6e5e2 introduced new exception classes for structured error reporting 2022-12-09 16:04:13 +07:00
zadam c22b6b29e0 options fixes 2022-12-08 15:29:14 +07:00
zadam 5fc9f5f3f9 improvements 2022-12-06 23:48:44 +07:00
zadam 74fdaad032 mobile fix 2022-12-04 22:59:09 +07:00
zadam 27ce273d29 bookmarks use cloning 2022-12-04 13:16:05 +07:00
zadam b85f335561 launcher improvements 2022-12-02 16:46:14 +07:00
zadam fc080f785b moving components to its own directory 2022-12-01 13:07:23 +07:00
zadam 1a6c9be065 renamed shortcuts to launchers 2022-12-01 10:16:57 +07:00
zadam 720fb0f73e refactorted shortcut handling into a service 2022-12-01 00:17:15 +07:00
zadam e759b4846a shortcut improvements 2022-11-29 16:16:57 +07:00
zadam a459230aa9 shortcuts improvements 2022-11-27 23:43:25 +07:00
zadam 6a9ac6f90a shortcuts improvements 2022-11-26 14:57:39 +07:00
zadam 6883b71ce7 shortcut improvements 2022-11-25 15:29:57 +07:00
zadam c7bda4d0be global menu ref 2022-11-24 22:59:09 +07:00
zadam 19126b7c6d Merge branch 'master' into next58 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
 2022-11-22 20:46:08 +07:00