250 Commits

Author	SHA1	Message	Date
Elian Doran	595402adea	dev: Fix npm start-electron script	2024-07-14 13:03:06 +03:00
Elian Doran	1dad4bc80f	Merge remote-tracking branch 'origin/develop' into feature/port_0.63.7	2024-07-14 09:58:37 +03:00
Elian Doran	5b30bae5b2	bin: Adapt copy-trilium to TypeScript changes	2024-07-13 21:11:03 +03:00
Elian Doran	d5c1bd1085	Merge remote-tracking branch 'upstream/master' into feature/port_0.63.7 ... ; Conflicts: ; package-lock.json ; src/routes/api/files.ts ; src/services/build.js ; src/services/notes.ts	2024-07-13 18:36:04 +03:00
Elian Doran	d18bfb9d69	docker: Fix build by generating artifacts	2024-07-13 11:40:52 +03:00
Elian Doran	60d134a89b	Revert "docker: Fix webpack" ... This reverts commit 0a7fcf399fb854a29c405d2d79f579d5a910bcc1.	2024-07-13 11:32:02 +03:00
Elian Doran	0a7fcf399f	docker: Fix webpack	2024-07-13 11:06:45 +03:00
Caleb Norton	f0d30dbe49	Add macos arm64 to release script	2024-05-18 03:48:33 -05:00
Caleb Norton	d142d3261d	support compiling native arm64 macos builds	2024-05-18 03:34:24 -05:00
alexpietsch	d2604e91d4	feat: add ts script for cross plattform use	2024-05-01 00:05:24 +02:00
Alex	e2b4eaf9cc	fix: copy only necessary modules	2024-04-29 23:37:08 +02:00
Alex	8c0ce174b5	fix: script permissions	2024-04-29 14:54:39 +02:00
alexpietsch	c8adf2a685	fix: restore start-electron script functionality	2024-04-29 00:36:27 +02:00
Elian Doran	db2b33704f	Merge branch 'feature/typescript_backend' into feature/typescript_backend_2	2024-03-30 10:54:06 +02:00
Alexei Kharchev	bb8bfc61ed	Improved scriptes bin/copy-trilium.sh, bin/build-linux-x64.sh	2024-03-02 14:18:39 +08:00
Alexei Kharchev	ff5d5d20d9	Reduce warnings count caused by bin/copy-trilium.sh	2024-03-02 11:49:17 +08:00
Elian Doran	9826fed905	server-ts: Port app* services	2024-02-17 19:09:36 +02:00
Elian Doran	a06aa9df8a	server-ts: Port anonymization service	2024-02-17 19:02:14 +02:00
zadam	cf99345962	use .js extension for require() as a preparation for future migration to ESM	2023-11-22 19:34:48 +01:00
zadam	45ed436426	added runOnBranchChange event #4108	2023-11-02 23:26:32 +01:00
zadam	52244ddc99	Merge branch 'beta' ... # Conflicts: # docs/backend_api/BAttachment.html # docs/backend_api/BNote.html # docs/backend_api/BackendScriptApi.html # package-lock.json # package.json	2023-10-19 01:13:45 +02:00
zadam	2132cf3bdc	nodejs 18.18.2	2023-10-18 09:40:00 +02:00
zadam	bd7fa16e96	Merge remote-tracking branch 'origin/master'	2023-10-09 23:08:32 +03:00
zadam	846ac9305e	don't anonymize option notes	2023-10-09 23:08:25 +03:00
Zack Rauen	a3540772dd	Merge remote-tracking branch 'upstream/master' into share	2023-10-08 17:19:32 -04: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
Zack Rauen	d259931bd2	Add new attributes in appropriate locations	2023-09-30 00:48:34 -04: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	cc06701565	swiftshader deletion is no longer needed	2023-07-24 22:33:36 +02:00
zadam	84c4b368c8	updated better-sqlite binaries for node 18/electron 25	2023-07-17 21:39:25 +02:00
zadam	b61aab06b5	nodejs upgrade	2023-07-15 10:32:26 +02:00
zadam	779751a234	rename "note revision" to just "revision"	2023-06-04 23:01:40 +02:00
zadam	c0cf319521	upgrade electron to 25 and node to 18	2023-05-04 21:01:25 +02:00
zadam	e16bedfab4	WIP blobs	2023-03-16 11:02:07 +01:00
zadam	929f8ef720	note ancillary/attachment backported from dev branch	2023-03-08 09:01:23 +01:00
zadam	9eb3075f65	Merge remote-tracking branch 'origin/master' into next59 ... # Conflicts: # bin/tpl/anonymize-database.sql	2023-02-28 23:25:51 +01:00
zadam	79f1eb6e5e	improvements in the anonymization script	2023-02-20 21:21:32 +01:00
zadam	4558e349b5	node update	2023-02-17 15:05:27 +01:00
zadam	6f7b554cdc	preparing 0.59 without ocr/pdf, userguide, note ancillaries	2023-02-17 14:49:45 +01:00
zadam	a9296e2a39	update node.js to 18	2023-02-10 10:44:38 +01:00
zadam	37ba76fdd8	refactored note attachment into note ancillary	2023-01-28 13:13:46 +01:00
zadam	bd8568809f	export/import attachments	2023-01-25 09:55:29 +01:00
zadam	339d8a7378	initial implementation of note attachments	2023-01-22 23:36:05 +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	7c98ade72b	fix missing doc resources for launchers, closes #3455	2022-12-25 11:58:24 +01:00
zadam	0441e7396a	small fixes	2022-12-23 15:07:48 +01:00
zadam	724f99f17c	add prefix "_" to "named" IDs	2022-12-21 16:11:00 +01:00