Commit Graph

255 Commits (b811f3d399aed7e740bd8e92ef7edc7d15de7038)

Author SHA1 Message Date
Elian Doran bbbbc3b860
bin/build*: Adjust error tolerance 2024-07-14 21:48:15 +07:00
Elian Doran c9f27547a2
bin/build*: Check if dpkg-deb tool is correct 2024-07-14 21:45:48 +07:00
Elian Doran 6bf063b92f
bin/build*: Check that required binaries are present 2024-07-14 21:35:08 +07:00
Elian Doran 4862b324a5
bin/release: Get rid of sponge 2024-07-14 21:13:06 +07:00
Elian Doran f678c4337b
bin/release: Fail if jq is missing 2024-07-14 21:12:51 +07:00
Elian Doran 595402adea
dev: Fix npm start-electron script 2024-07-14 13:03:06 +07:00
Elian Doran 1dad4bc80f
Merge remote-tracking branch 'origin/develop' into feature/port_0.63.7 2024-07-14 09:58:37 +07:00
Elian Doran 5b30bae5b2
bin: Adapt copy-trilium to TypeScript changes 2024-07-13 21:11:03 +07: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 +07:00
Elian Doran d18bfb9d69
docker: Fix build by generating artifacts 2024-07-13 11:40:52 +07:00
Elian Doran 60d134a89b
Revert "docker: Fix webpack"
This reverts commit 0a7fcf399f.
2024-07-13 11:32:02 +07:00
Elian Doran 0a7fcf399f
docker: Fix webpack 2024-07-13 11:06:45 +07:00
Caleb Norton f0d30dbe49 Add macos arm64 to release script 2024-05-18 03:48:33 +07:00
Caleb Norton d142d3261d support compiling native arm64 macos builds 2024-05-18 03:34:24 +07:00
alexpietsch d2604e91d4 feat: add ts script for cross plattform use 2024-05-01 00:05:24 +07:00
Alex e2b4eaf9cc fix: copy only necessary modules 2024-04-29 23:37:08 +07:00
Alex 8c0ce174b5 fix: script permissions 2024-04-29 14:54:39 +07:00
alexpietsch c8adf2a685 fix: restore start-electron script functionality 2024-04-29 00:36:27 +07:00
Elian Doran db2b33704f
Merge branch 'feature/typescript_backend' into feature/typescript_backend_2 2024-03-30 10:54:06 +07:00
Alexei Kharchev bb8bfc61ed Improved scriptes bin/copy-trilium.sh, bin/build-linux-x64.sh 2024-03-02 14:18:39 +07:00
Alexei Kharchev ff5d5d20d9 Reduce warnings count caused by bin/copy-trilium.sh 2024-03-02 11:49:17 +07:00
Elian Doran 9826fed905
server-ts: Port app* services 2024-02-17 19:09:36 +07:00
Elian Doran a06aa9df8a
server-ts: Port anonymization service 2024-02-17 19:02:14 +07:00
zadam cf99345962 use .js extension for require() as a preparation for future migration to ESM 2023-11-22 19:34:48 +07:00
zadam 45ed436426 added runOnBranchChange event #4108 2023-11-02 23:26:32 +07: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 +07:00
zadam 2132cf3bdc nodejs 18.18.2 2023-10-18 09:40:00 +07:00
zadam bd7fa16e96 Merge remote-tracking branch 'origin/master' 2023-10-09 23:08:32 +07:00
zadam 846ac9305e don't anonymize option notes 2023-10-09 23:08:25 +07:00
Zack Rauen a3540772dd Merge remote-tracking branch 'upstream/master' into share 2023-10-08 17:19:32 +07:00
zadam 1dc3fafcbf improve anonymization 2023-10-03 23:17:15 +07:00
zadam 7f06952d9e improve anonymization 2023-10-03 23:14:02 +07:00
Zack Rauen d259931bd2 Add new attributes in appropriate locations 2023-09-30 00:48:34 +07:00
zadam d0383f3044 remove debian packaging hack 2023-09-21 12:44:20 +07:00
zadam 62ecd1ad76 node 18.18.0 2023-09-21 12:29:11 +07:00
zadam cc06701565 swiftshader deletion is no longer needed 2023-07-24 22:33:36 +07:00
zadam 84c4b368c8 updated better-sqlite binaries for node 18/electron 25 2023-07-17 21:39:25 +07:00
zadam b61aab06b5 nodejs upgrade 2023-07-15 10:32:26 +07:00
zadam 779751a234 rename "note revision" to just "revision" 2023-06-04 23:01:40 +07:00
zadam c0cf319521 upgrade electron to 25 and node to 18 2023-05-04 21:01:25 +07:00
zadam e16bedfab4 WIP blobs 2023-03-16 11:02:07 +07:00
zadam 929f8ef720 note ancillary/attachment backported from dev branch 2023-03-08 09:01:23 +07:00
zadam 9eb3075f65 Merge remote-tracking branch 'origin/master' into next59
# Conflicts:
#	bin/tpl/anonymize-database.sql
2023-02-28 23:25:51 +07:00
zadam 79f1eb6e5e improvements in the anonymization script 2023-02-20 21:21:32 +07:00
zadam 4558e349b5 node update 2023-02-17 15:05:27 +07:00
zadam 6f7b554cdc preparing 0.59 without ocr/pdf, userguide, note ancillaries 2023-02-17 14:49:45 +07:00
zadam a9296e2a39 update node.js to 18 2023-02-10 10:44:38 +07:00
zadam 37ba76fdd8 refactored note attachment into note ancillary 2023-01-28 13:13:46 +07:00
zadam bd8568809f export/import attachments 2023-01-25 09:55:29 +07:00
zadam 339d8a7378 initial implementation of note attachments 2023-01-22 23:36:05 +07:00