263 Commits

Author	SHA1	Message	Date
SiriusXT	490ae1c9fd	icon improvements	2024-09-05 15:09:31 +08:00
zadam	9357caeb5a	activate parent note when deleting a note, #4601	2024-01-28 23:08:44 +01:00
zadam	93dcce2217	dragging notes from note tree will automatically insert them as images where appropriate (image, canvas, mermaid)	2023-11-27 10:38:19 +01:00
zadam	b700f069fe	reduce flickering while hoisted	2023-11-06 23:11:57 +01:00
zadam	40fb6aa168	move the unhoist button to the right	2023-11-06 22:28:25 +01:00
zadam	76f874ef6d	refactoring of the complex note tree entitiesReloadedEvent	2023-11-03 08:58:57 +01:00
zadam	f37f47ce5b	fixes to stable sorting	2023-11-03 01:11:47 +01:00
zadam	ca041bb658	fix expanded status when moving note trees	2023-10-19 08:58:04 +02:00
zadam	d9666210f1	make sure that the hidden note is never selected when hoisted to root to avoid e.g. erroneous deletion	2023-09-13 16:57:24 +02:00
zadam	04b125afc0	sync fixes and refactorings	2023-07-29 21:59:20 +02:00
zadam	04c306b360	support combination of shared and cloned in the note tree, fixes #4097	2023-07-17 22:26:41 +02:00
zadam	2b2f4fbc07	comment	2023-07-15 09:48:30 +02:00
zadam	b7f0fd2db3	Merge branch 'master' into next61 ... # Conflicts: # package-lock.json # src/public/app/services/note_content_renderer.js # src/public/app/widgets/note_tree.js # src/routes/routes.js # src/services/consistency_checks.js # src/services/notes.js # src/services/task_context.js	2023-07-10 18:20:36 +02:00
zadam	192e399cb5	typos	2023-06-30 11:18:34 +02:00
Kian-Meng Ang	712304bbc6	Fix typos ... Found via `codespell -S ./libraries,./package-lock.json -L tabel,tabels,uptodate,isnt,edn,falsy`	2023-06-23 00:27:04 +08:00
zadam	1f3b6feaff	Merge branch 'master' into next61 ... # Conflicts: # src/public/app/widgets/note_tree.js	2023-06-20 23:28:41 +02:00
zadam	bbe3f436d3	avoid scrolling to active node without a reason, fixes #4031	2023-06-18 21:50:22 +02:00
zadam	75c6afd1c3	fix loading of string content saved as binary	2023-06-14 22:21:22 +02:00
zadam	ac56056f65	Merge branch 'master' into next61 ... # Conflicts: # package-lock.json # src/routes/api/recent_changes.js	2023-06-13 23:25:35 +02:00
zadam	bea39f37ee	stop click propagation in tree item actions	2023-06-13 00:12:55 +02:00
zadam	5c393f959d	got rid of .isDeleted on froca entities (the property is not available there)	2023-06-05 16:26:05 +02:00
zadam	e6bf6424e8	rename loadresults methods/properties for clarity that they don't contain entities, only rows	2023-06-05 16:12:02 +02:00
zadam	0aa119af2c	attachments WIP	2023-05-29 00:19:54 +02:00
zadam	626af84f42	refactoring + uploading attachments WIP	2023-05-08 00:02:08 +02:00
zadam	6dfc72c065	many small fixes from Intellij analysis	2023-05-05 23:17:23 +02:00
zadam	8edf06d28d	small refactorings	2023-05-04 22:16:18 +02:00
zadam	0896000fcd	Merge branch 'stable'	2023-04-24 20:21:22 +02:00
zadam	8b46d6c718	Merge branch 'stable' into next60	2023-04-19 22:03:44 +02:00
zadam	e24d5a6f83	collapse command will collapse the whole tree, including the current active note path, fixes #3664	2023-04-19 21:24:51 +02:00
zadam	b84670d503	Merge branch 'master' into next60	2023-04-17 22:27:21 +02:00
baiyongjie	ad8ec68443	fix: correct active tree node after moving an clone node	2023-04-13 11:05:53 +08:00
zadam	a154bea016	Merge branch 'master' into next60	2023-04-11 17:02:24 +02:00
MeIchthys	8a4caaf6fb	Add border to tree-actions section and adjust padding	2023-03-24 15:17:17 -04:00
MeIchthys	fa6d1879dd	Move .tree-actions left to accomodate wider windows scrollbar	2023-03-24 14:46:09 -04:00
zadam	0b270ee87a	remove "hide included images" feature since with attachments it's no longer necessary	2023-03-24 09:17:17 +01:00
zadam	e411ad0eb1	Merge branch 'master' into dev	2023-02-13 15:58:02 +01:00
zadam	17085e5578	fix hidden subtree appearing after collapse, #2922	2023-02-13 15:09:57 +01: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 +01:00
zadam	2e181d0fb1	toggling the left pane will toggle the focus between tree and detail, #3563	2023-01-31 22:35:01 +01: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 +01:00
zadam	f50a9c250a	many small issues found by intellij analysis	2023-01-15 21:04:17 +01:00
zadam	9479f1c1a1	toggling archived notes caused appearance of hidden subtree, fixes #3519	2023-01-13 11:25:58 +01:00
zadam	4ab90b694f	fix	2023-01-09 23:15:02 +01: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 +01:00
zadam	571cb6d0eb	fix dynamic module import	2023-01-09 22:32:49 +01:00
zadam	8a641e1b4f	added "inherit" relation, #3493	2023-01-06 20:31:55 +01:00
zadam	d7cae7d5bb	improvements in API docs generation	2023-01-05 23:38:41 +01:00
zadam	ac51d0d569	Merge branch 'master' into dev ... # Conflicts: # package-lock.json # package.json	2023-01-05 16:17:33 +01:00
zadam	034098fd06	don't use alert, #3483	2023-01-05 15:23:22 +01:00
zadam	977a47bc27	rename froca entities to have F-prefix, #3476	2023-01-03 13:35:10 +01:00