96 Commits

Author	SHA1	Message	Date
zadam	5d52498da1	Merge branch 'stable'	2023-11-14 00:19:15 +01:00
zadam	5a38bf78e1	fix content renderer of protected canvas/mermaid notes, closes #4414	2023-11-12 23:43:04 +01:00
zadam	f37f47ce5b	fixes to stable sorting	2023-11-03 01:11:47 +01:00
zadam	494b240015	Merge branch 'beta' ... # Conflicts: # src/public/app/layouts/desktop_layout.js	2023-10-24 00:09:37 +02:00
zadam	b39ba76505	add ability to insert mermaid diagram into text notes as image	2023-10-21 00:23:16 +02:00
zadam	99d0f22403	Merge branch 'beta' ... # Conflicts: # package-lock.json	2023-10-07 20:51:26 +03:00
zadam	055bb39e4d	Merge remote-tracking branch 'origin/beta' into beta	2023-10-02 22:02:31 +02:00
zadam	1261a06a30	order by note size + attachments + revisions, closes #4295	2023-10-02 22:02:25 +02:00
zadam	5be61e6142	saving / viewing canvas revisions	2023-10-02 15:24:40 +02:00
zadam	a749e24147	fix creating revisions for non-text notes #4176	2023-09-21 11:38:38 +02:00
zadam	035113db4d	Merge branch 'beta' ... # Conflicts: # package-lock.json	2023-09-14 00:19:19 +02:00
zadam	f37dc66074	add support for storing canvas libraries in note attachments plus storing exported SVG in attachment	2023-09-08 21:53:57 +02:00
zadam	da8025f1e4	Merge branch 'beta'	2023-09-06 23:00:45 +02:00
zadam	d2263c68f8	provide note dates in the frontend API, fixes #4232	2023-09-06 22:54:31 +02:00
Zack Rauen	d3730ac1a9	Fix and improve JSDoc for APIs	2023-08-21 04:15:53 -04:00
zadam	d706b3a447	fix saving revisions for non-text types, closes #4176	2023-08-17 16:39:57 +02:00
zadam	bc8f531b33	fix a bug which caused immedate deletion of created attributes	2023-07-17 22:53:54 +02:00
zadam	30bcd1764a	check the attachment after upload	2023-07-14 21:28:32 +02:00
zadam	cea54aecad	check the attachment after conversion	2023-07-14 21:18:56 +02:00
zadam	2dac6ab281	DB migration should convert only "perfect candidates" to attachments	2023-07-14 18:24:15 +02:00
zadam	d475346a09	renamed attachment's parentId to more fitting ownerId	2023-07-14 17:01:56 +02:00
zadam	a748710b01	make file attachments accessible in revisions dialog	2023-07-10 20:30:04 +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
zadam	788841d256	fix mentions	2023-06-29 12:19:01 +02:00
zadam	a452e4add5	sync fixes	2023-06-28 21:05:31 +02:00
zadam	85a75fc186	getOwnedAttributes() should not make a copy, consistent with similar methods	2023-06-27 23:03:17 +02:00
zadam	3b3f6082a7	attachment ETAPI support WIP	2023-06-05 09:23:42 +02:00
zadam	93addac8bb	Merge branch 'master' into next61 ... # Conflicts: # src/becca/entities/bnote.js # src/public/app/components/note_context.js # src/public/app/layouts/desktop_layout.js # src/public/app/services/note_content_renderer.js # src/public/app/services/utils.js # src/public/app/widgets/ribbon_widgets/file_properties.js # src/public/app/widgets/ribbon_widgets/note_info_widget.js # src/services/notes.js	2023-06-05 00:09:55 +02:00
zadam	779751a234	rename "note revision" to just "revision"	2023-06-04 23:01:40 +02:00
zadam	cb9feab7b2	got rid of the hot/cold blob, all blobs are "cold" now	2023-06-04 22:50:07 +02:00
zadam	758dba9ba5	fix event	2023-06-01 00:13:08 +02:00
zadam	ae42e0efc7	refactoring	2023-06-01 00:07:57 +02:00
zadam	b5cfc28912	rename inheritableAttributeCache to __inheritableAttributeCache for consistency	2023-05-31 23:21:06 +02:00
zadam	a9dae7823f	script api docs	2023-05-31 14:00:37 +02:00
zadam	0aa119af2c	attachments WIP	2023-05-29 00:19:54 +02:00
zadam	579ed7e194	attachment content rendering	2023-05-21 18:14:17 +02:00
zadam	626af84f42	refactoring + uploading attachments WIP	2023-05-08 00:02:08 +02:00
zadam	2aa987c072	fixes for zip export/import in regard to attachments	2023-05-06 22:50:28 +02:00
zadam	6dfc72c065	many small fixes from Intellij analysis	2023-05-05 23:17:23 +02:00
zadam	0af6f91d21	exposing blobs in APIs	2023-05-05 22:21:51 +02:00
zadam	5e1f81e53e	getting rid of note complement WIP	2023-05-05 16:37:39 +02:00
zadam	9cdcbb3125	fix runOnNoteContentChange event	2023-05-05 15:42:53 +02:00
zadam	8edf06d28d	small refactorings	2023-05-04 22:16:18 +02:00
zadam	d8bc9c2982	attachment actions	2023-05-03 10:23:20 +02:00
zadam	735ac55bb8	fixes, allowing conversion of note into an attachment	2023-05-02 22:46:39 +02:00
zadam	330e7ac08e	copying attachments WIP	2023-04-25 00:01:58 +02:00
zadam	e71b0d82a1	scheduled attachment deletion WIP	2023-04-20 00:11:09 +02:00
zadam	c6c162cdda	restore revision with attachments	2023-04-19 22:47:33 +02:00
zadam	e28fbf4617	fixes	2023-04-17 23:21:28 +02:00