6920 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zadam	db8014c0ef	Merge pull request #4298 from rauenzi/share ... Add ~shareTemplate and #shareExternalLink	2023-10-09 22:28:20 +03:00
Zack Rauen	a3540772dd	Merge remote-tracking branch 'upstream/master' into share	2023-10-08 17:19:32 -04:00
zadam	137703ada4	add promoted attributes widget to the mobile version, closes #4314	2023-10-08 22:58:31 +03:00
Zack Rauen	ec6b8476f9	Adjust shared notes search api	2023-10-08 14:54:37 -04:00
zadam	00f5924251	jsdocs	2023-10-07 20:57:53 +03:00
zadam	99d0f22403	Merge branch 'beta' ... # Conflicts: # package-lock.json	2023-10-07 20:51:26 +03:00
zadam	78f8a37587	added total result count to the note list widget	2023-10-06 22:02:09 +03:00
zadam	86d62866f2	catch JSON stringify error, #4310	2023-10-05 21:54:59 +02:00
zadam	1dc3fafcbf	improve anonymization	2023-10-03 23:17:15 +02:00
zadam	7f06952d9e	improve anonymization	2023-10-03 23:14:02 +02:00
zadam	78b6614eea	fix docker-compose.yml #2239	2023-10-03 11:21:14 +02:00
zadam	9665e872c2	fix importing inline images within markdown within zip, closes #4301	2023-10-03 09:40:31 +02:00
zadam	9db0a062ed	fix calculating revision attachment size	2023-10-03 09:05:30 +02: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	91eb3c45d5	added "save revision" to note actions menu	2023-10-02 15:29:45 +02:00
zadam	3944235592	-console.log	2023-10-02 15:25:12 +02:00
zadam	5be61e6142	saving / viewing canvas revisions	2023-10-02 15:24:40 +02:00
zadam	62ccf798ee	allow deleting custom launchers, fixes #4291	2023-09-30 22:38:06 +02:00
Zack Rauen	d259931bd2	Add new attributes in appropriate locations	2023-09-30 00:48:34 -04:00
Zack Rauen	7729aad1e9	Allow external link notes in share tree	2023-09-30 00:44:10 -04:00
zadam	70d6bd0157	release 0.61.8-beta v0.61.8-beta	2023-09-29 00:54:45 +02:00
zadam	e5555beea9	logging reason for frontend reload	2023-09-28 23:47:19 +02:00
zadam	9767b6269a	upgrade code mirror to 5.65.15 and fix modes requiring multiplex or overlay, fixes #4279	2023-09-28 01:02:27 +02:00
zadam	7e486fda06	electron update	2023-09-28 00:27:00 +02:00
zadam	9f726304aa	sync fix, #4288	2023-09-28 00:24:53 +02:00
Zack Rauen	614cc4dd82	Allow users to use their own share template	2023-09-27 14:34:07 -04:00
zadam	3e8f09d306	allow shrinking note title text in the tree to make space for the "add note" button https://github.com/zadam/trilium/discussions/4287	2023-09-26 00:14:28 +02:00
zadam	613b83e638	Merge pull request #4281 from rauenzi/jump-to-toc ... Fix jump to ToC for nested headers	2023-09-25 23:33:00 +02:00
zadam	4ac609ff57	Merge pull request #4280 from rauenzi/promoted-alias ... Add option for promoted aliases	2023-09-25 23:30:39 +02:00
zadam	c14ce2c428	Merge pull request #4278 from Nriver/master ... sort mime types alphabetically	2023-09-25 23:28:22 +02:00
zadam	984bd726e9	add support for "bottom" sort, closes #4277	2023-09-25 23:25:00 +02:00
zadam	964abf390b	API docs	2023-09-25 23:11:24 +02:00
zadam	af24758ad4	Merge branch 'beta' ... # Conflicts: # docs/backend_api/BAttachment.html # docs/backend_api/BNote.html # docs/backend_api/becca_entities_bnote.js.html # docs/frontend_api/FAttribute.html # docs/frontend_api/FBranch.html # docs/frontend_api/FNote.html # docs/frontend_api/FrontendScriptApi.html # docs/frontend_api/entities_fattachment.js.html # docs/frontend_api/entities_fattribute.js.html # docs/frontend_api/entities_fblob.js.html # docs/frontend_api/entities_fbranch.js.html # docs/frontend_api/entities_fnote.js.html # docs/frontend_api/global.html # docs/frontend_api/index.html # docs/frontend_api/services_frontend_script_api.js.html # package-lock.json	2023-09-25 23:11:07 +02:00
zadam	528d94a8fb	accept custom widgets as classes instead of instances, #4274	2023-09-25 23:05:54 +02:00
zadam	be918628c3	global API docs	2023-09-25 23:04:03 +02:00
zadam	602b9ae64a	API docs	2023-09-23 00:04:32 +02:00
zadam	602a166e36	added info, confirm, prompt dialogs	2023-09-23 00:04:16 +02:00
zadam	2e69cc8331	Merge pull request #4267 from rauenzi/tray ... Add hotkey option to toggle hide to tray	2023-09-22 23:52:47 +02:00
zadam	aaad858395	save scroll and zoom in canvas	2023-09-22 23:44:03 +02:00
Zack Rauen	b266c327e4	Fix jump to ToC for nested headers	2023-09-22 05:52:06 -04:00
Zack Rauen	149462e3ab	Add option for promoted alias	2023-09-22 04:58:06 -04:00
Nriver	237d309406	sort mime types alphabetically	2023-09-22 09:58:37 +08:00
zadam	48248224f8	release 0.61.7-beta v0.61.7-beta	2023-09-21 23:38:18 +02:00
zadam	79e5e3b65f	more logging for sync	2023-09-21 18:13:14 +02:00
zadam	d0383f3044	remove debian packaging hack	2023-09-21 12:44:20 +02:00
zadam	62ecd1ad76	node 18.18.0	2023-09-21 12:29:11 +02:00
zadam	75b7706c2c	mermaid 10.4.0	2023-09-21 12:24:44 +02:00
zadam	584b176643	hiding useless/misleading buttons from excalidraw	2023-09-21 12:03:40 +02:00
zadam	a16555bbff	don't save appState in canvas - app state should be reset after each load	2023-09-21 11:54:54 +02:00