7589 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Elian Doran	eff6ca3365	Merge pull request #173 from TriliumNext/feat/ts-unit-and-integration-tests ... feat: TS unit and integration tests	2024-07-15 21:21:11 +03:00
Elian Doran	6a7eb9b34f	Merge remote-tracking branch 'origin/develop' into feat/ts-unit-and-integration-tests ... ; Conflicts: ; package.json ; tsconfig.json	2024-07-15 21:17:20 +03:00
Elian Doran	1e54a9660b	Revert indentation change	2024-07-15 21:15:22 +03:00
Elian Doran	653fba3b71	client: Fix URL to repository	2024-07-15 20:21:43 +03:00
Elian Doran	ea47668916	server: Clarify name	2024-07-15 19:31:59 +03:00
Elian Doran	81a2b206ca	electron: Improve run & switch scripts	2024-07-15 19:25:55 +03:00
Elian Doran	ddce014495	server: Fix sync failing if local EC is missing	2024-07-15 19:25:31 +03:00
Elian Doran	f323193c9d	release 0.90.0-beta	2024-07-14 22:32:45 +03:00
Elian Doran	b811f3d399	release 0.90.0-beta v0.90.0-beta	2024-07-14 22:32:17 +03:00
Elian Doran	bbbbc3b860	bin/build*: Adjust error tolerance	2024-07-14 21:48:15 +03:00
Elian Doran	c9f27547a2	bin/build*: Check if dpkg-deb tool is correct	2024-07-14 21:45:48 +03:00
Elian Doran	6bf063b92f	bin/build*: Check that required binaries are present	2024-07-14 21:35:08 +03:00
Elian Doran	590442b0d5	client,server: Trilium Notes -> TriliumNext Notes (closes #195)	2024-07-14 21:20:42 +03:00
Elian Doran	4862b324a5	bin/release: Get rid of sponge	2024-07-14 21:13:06 +03:00
Elian Doran	f678c4337b	bin/release: Fail if jq is missing	2024-07-14 21:12:51 +03:00
Elian Doran	686b9c840e	release 0.9.0	2024-07-14 21:04:43 +03:00
Elian Doran	2e8b2d4b81	server: Fix empty note titles (closes #205)	2024-07-14 20:50:42 +03:00
Elian Doran	3d423d25f8	Merge pull request #208 from TriliumNext/bugfix/fix_importing_non_text_files ... Unable to import a PDF file	2024-07-14 17:14:04 +03:00
Elian Doran	79123b0c63	server: Fix import of non-text files	2024-07-14 15:21:45 +03:00
Elian Doran	595402adea	dev: Fix npm start-electron script	2024-07-14 13:03:06 +03:00
Elian Doran	f40257b591	Merge pull request #206 from TriliumNext/bugfix/image_upload_regression ... server: Fix regression in uploading images	2024-07-14 11:07:34 +03:00
Elian Doran	b6ca2281f7	Merge pull request #199 from TriliumNext/feature/port_0.63.7 ... Port 0.63.7	2024-07-14 10:17:18 +03:00
Elian Doran	186650b1cf	ci: Add workflow to build macOS ARM64	2024-07-14 10:12:12 +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	d66a70f099	Merge pull request #201 from TriliumNext/feature/fix_build_scripts ... Fix build scripts & add CI for running them	2024-07-14 09:58:00 +03:00
Elian Doran	0792714e45	server: Fix regression in uploading images ... The attachment is first saved with no content while the image is being asynchronously resized. On our side we had a guard condition fail if the content was empty, whereas the original implementation was simply using an empty string instead.	2024-07-14 09:52:01 +03:00
Elian Doran	6ecbf1c528	Merge pull request #198 from TriliumNext/bugfix/note_import_type ... Fix import note type	2024-07-14 00:51:04 +03:00
Elian Doran	5460359753	Merge pull request #196 from TriliumNext/feature/fix_docker_build ... Fix Docker build	2024-07-14 00:43:33 +03:00
Elian Doran	75ebe24abb	ci: Remove temporary branch config	2024-07-14 00:43:04 +03:00
Elian Doran	3f5e5fd840	ci: Set up Wine	2024-07-14 00:30:49 +03:00
Elian Doran	998db5ce95	ci: Add build Windows	2024-07-14 00:14:30 +03:00
Elian Doran	7aed6d4ad4	ci: Add build Linux Server	2024-07-13 23:16:35 +03:00
Elian Doran	99ea741275	ci: Add build Linux	2024-07-13 22:52:28 +03:00
Elian Doran	e6ff99198f	ci: Fix docker build after macOS integration	2024-07-13 22:10:57 +03:00
Elian Doran	7c43a49046	ci: Add workflow for building macOS x86_64	2024-07-13 21:39:22 +03:00
Elian Doran	5b30bae5b2	bin: Adapt copy-trilium to TypeScript changes	2024-07-13 21:11:03 +03:00
Elian Doran	947aaa6156	webpack: Switch to TypeScript-based config	2024-07-13 21:10:40 +03:00
Elian Doran	534fe87fb1	Merge pull request #200 from TriliumNext/feature/basic_ci ... Basic CI pipeline	2024-07-13 20:21:23 +03:00
Elian Doran	1652a7a2ec	ci: Remove test branch	2024-07-13 20:04:00 +03:00
Elian Doran	7184c648ab	ci: Test Docker publishing	2024-07-13 19:39:56 +03:00
Elian Doran	be239d2230	ci: Set up node environment & cache	2024-07-13 19:11:25 +03:00
Elian Doran	439bf410ac	ci: Use newer versions of actions	2024-07-13 19:05:39 +03:00
Elian Doran	5aadcb69f8	Merge branch 'feature/fix_docker_build' into feature/basic_ci	2024-07-13 19:02:57 +03:00
Elian Doran	543c29e539	server: Change build directory	2024-07-13 19:02:51 +03:00
Elian Doran	8bcff49198	ci: Install npm dependencies	2024-07-13 18:57:13 +03:00
Elian Doran	c0cc1e3b52	ci: Run tsc & create server-package.json	2024-07-13 18:56:18 +03:00
Elian Doran	19550eec6a	ci: Set up Docker build in dev workflow	2024-07-13 18:51:46 +03:00
Elian Doran	45f2691053	ci: Disable original CI workflows	2024-07-13 18:47:53 +03:00
Elian Doran	ba2931b854	Update package.json	2024-07-13 18:41:36 +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