sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,529 Commits
21 Branches
339 Tags
369 MiB
Commit Graph

473 Commits (aadb8cce5d425dc8f211170b51a5088a9aaea94b)

Author SHA1 Message Date
Jin 0967ee1b46 remove fancytree and bootstrap 2024-08-11 10:13:01 +07:00
Jin c16c528270 fix electron import 2024-08-11 10:13:01 +07:00
Jin b83c6023c4 port dump-db and other tools to TS 2024-08-10 18:23:49 +07:00
JYC333 b05e51f2f1
Merge branch 'TriliumNext:develop' into sql 2024-08-09 22:40:54 +07:00
perf3ct 13ad877b2f
also change the tags of build-docker.sh to triliumnext 2024-08-08 15:17:38 +07:00
slashtechno 4bc24246ab
Update Docker image tag in build script 2024-08-07 15:51:29 +07:00
Elian Doran 712ef92f7c
build: Mark releases as draft 2024-08-06 20:40:54 +07:00
Jin e10df0708c remove old build scripts 2024-08-05 20:30:16 +07:00
Jin 39c0250833 fix server package 2024-08-05 20:20:35 +07:00
Jin e5e92c8ece add electron-forge for all platforms 2024-08-05 18:47:57 +07:00
Jin 5f6aba8a10 remove comments 2024-08-05 17:14:24 +07:00
Jin e5c1d38722 - Remove hard-coded `better-sqlite3` binaries 
- Fix ExperimentalWarning
 2024-08-05 17:14:24 +07:00
Elian Doran 8ca6dbe34b
Scale mac icon to 0.8 2024-08-04 17:11:46 +07:00
Elian Doran 5ee62d4d65
Create Big Sur-style icons 2024-08-04 16:42:35 +07:00
Elian Doran 03cb773560
Add sharper icons using Inkscape for rendering 2024-08-04 15:36:51 +07:00
Elian Doran 3659cad587
bin: Don't remove intermediate icons, simply ignore them 2024-08-04 15:18:39 +07:00
Elian Doran 54b9bcb6de
Build small icons for macOS as well 2024-08-04 14:30:55 +07:00
Elian Doran 712b180f94
Set up 1024x1024 icon for macOS 2024-08-04 14:26:30 +07:00
Elian Doran 3ce2c98317
bin: Add asserts for create-icons dependencies 2024-08-04 14:26:10 +07:00
Elian Doran a94c2c45b7
build: Build Squirrel splash image as well 2024-08-03 22:25:10 +07:00
Elian Doran f81bf509cd
build: Create script to build icons for the application 2024-08-03 22:20:05 +07:00
Elian Doran 1d142b9e57
build: Fix accidental change in release script 2024-07-28 10:12:08 +07:00
Elian Doran 32dc064ffa
docs: Add some more documentation 2024-07-27 23:49:56 +07:00
Elian Doran d9d8fff249
docs: Update example env 2024-07-27 23:39:15 +07:00
Elian Doran 312c85ae30
docs: Update documentation 2024-07-27 23:28:14 +07:00
Elian Doran f5e02102e7
docs: Improve the preview script 2024-07-27 23:27:18 +07:00
Elian Doran f32fb168dc
docs: Fix the prepare script if run from a different dir 2024-07-27 23:27:11 +07:00
Elian Doran e5cdccc066
build: Make copy-dist silent 2024-07-27 16:42:47 +07:00
Elian Doran 7b2d70ba56
Merge remote-tracking branch 'origin/develop' into feature/server_esm_part3 2024-07-27 15:20:39 +07:00
Elian Doran 25db092b41
electron: Fix crash due to missing i18next 2024-07-24 21:04:20 +07:00
Elian Doran f382d3c728
Merge remote-tracking branch 'origin/feature/update_bettersqlite3' into feature/server_esm_part3 2024-07-24 00:02:15 +07:00
Elian Doran fd1f43d192
Merge remote-tracking branch 'origin/feature/update_electron' into feature/server_esm_part3 2024-07-24 00:01:44 +07:00
Elian Doran faa9ebe1bc build: Remove unnecessary rm 2024-07-23 00:24:27 +07:00
Elian Doran 26efa9299e build: Fix export = 2024-07-23 00:17:20 +07:00
Elian Doran 6f6ce38538 build: Increase strictness of copy-trilium 2024-07-22 21:44:48 +07:00
Elian Doran e74eff75db Revert "build: Export correct build info" 
This reverts commit ef4f0f80b9.
 2024-07-22 21:43:55 +07:00
Elian Doran 7fb4a66127 build: Remove redundant rm 2024-07-22 21:39:36 +07:00
Elian Doran ef4f0f80b9 build: Export correct build info 2024-07-22 21:35:24 +07:00
Elian Doran dd14ba9e0e build: Increase error strictness 2024-07-22 21:33:07 +07:00
Elian Doran 043313c71a Merge branch 'feature/update_electron' into feature/update_bettersqlite3 2024-07-21 23:29:48 +07:00
Elian Doran 62804ec67a Merge remote-tracking branch 'origin/develop' into feature/update_electron 2024-07-21 23:28:03 +07:00
Elian Doran 715a952148
build: Remove auth if token not provided 2024-07-21 13:24:44 +07:00
Elian Doran d09578735e
build: Implement cross-platform build info script 2024-07-21 11:45:31 +07:00
Elian Doran 5a8442f3d8
build: Fix artifacts not generated due to name change 2024-07-21 10:57:43 +07:00
Elian Doran f07a6600c9
ci: Patch package.json main 2024-07-21 09:12:46 +07:00
Elian Doran e380fa5224
ci: Fix permission issue with build script 2024-07-20 22:10:09 +07:00
Elian Doran 128af66797
ci: Don't pack Windows artifact 2024-07-20 22:02:29 +07:00
Elian Doran 80e647ffec
ci: Update build info 2024-07-20 21:58:14 +07:00
Elian Doran 758c08ec85
build: Remove map files & ts files 2024-07-20 20:55:38 +07:00
Elian Doran cb0d1d80a1
build: Remove some more unnecessary files 2024-07-20 20:53:33 +07:00
Elian Doran 9dcf51b117
build: Remove some unnecessary files 2024-07-20 20:39:18 +07:00
Elian Doran 389097bcc2
build: Silence clean-up phase 2024-07-20 20:31:36 +07:00
Elian Doran 366e791e2d
build: Use--omit=dev 2024-07-20 20:19:38 +07:00
Elian Doran 338012ec7e
build: Bring update script for better-sqlite3 2024-07-20 16:48:41 +07:00
Elian Doran e778680e94
Merge branch 'feature/update_to_node20' into feature/update_electron 2024-07-20 16:39:38 +07:00
Elian Doran 9b9180e5c8
Merge remote-tracking branch 'origin/develop' into feature/update_to_node20 2024-07-20 16:30:46 +07:00
Elian Doran 946a02fd67
build: Determine better-sqlite3 version automatically 2024-07-20 15:13:42 +07:00
Elian Doran 2a57765dd9
build: Update bettersqlite3 binary for Linux server 2024-07-20 15:13:42 +07:00
Elian Doran 42c0a557b4
build: Update bettersqlite3 binary for Linux desktop 2024-07-20 15:13:42 +07:00
Elian Doran aa6cf1f11c
build: Update bettersqlite3 binary for macOS 2024-07-20 15:13:42 +07:00
Elian Doran d73b10d10d
build: Update bettersqlite3 binary for Windows 2024-07-20 15:13:42 +07:00
Elian Doran 6aea3b1472
Revert "build: Investigate not embedding better_sqlite3 natives" 
This reverts commit 0e10fbb0875e515b6c10d4d010fe81464b41f6b4.
 2024-07-20 15:13:40 +07:00
Elian Doran edc18e5be8
Revert "build: Fix ".node is not a valid Win32 application"" 
This reverts commit 8ac84e12c8dd2a838bf602e032b08d507b9d763b.
 2024-07-20 15:13:19 +07:00
Elian Doran 86659552ee
build: Fix ".node is not a valid Win32 application" 
See https://github.com/electron/packager/issues/740.
 2024-07-20 15:13:19 +07:00
Elian Doran 03ab41bfba
build: Investigate not embedding better_sqlite3 natives 2024-07-20 15:13:17 +07:00
Elian Doran 9db4e1d7d3
build: Fix Node version incompatibility 2024-07-20 15:10:50 +07:00
Elian Doran 05776d178e
docs: Move binaries to bin/ 2024-07-20 13:14:48 +07:00
Elian Doran e74b7f6964
build: Update NODE_VERSION in build-server 2024-07-17 01:08:33 +07:00
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
zadam 8a641e1b4f added "inherit" relation, #3493 2023-01-06 20:31:55 +07:00
zadam d7cae7d5bb improvements in API docs generation 2023-01-05 23:38:41 +07:00
zadam 7c98ade72b fix missing doc resources for launchers, closes #3455 2022-12-25 11:58:24 +07:00
zadam 0441e7396a small fixes 2022-12-23 15:07:48 +07:00
zadam 724f99f17c add prefix "_" to "named" IDs 2022-12-21 16:11:00 +07:00
zadam 5413a1aa79 create new runOnNoteContentChange event, #3436 2022-12-18 23:53:47 +07:00
zadam e3047ee450 Merge remote-tracking branch 'origin/master' into next58 2022-12-12 21:43:45 +07:00
Orsiris de Jong fc40e54261 Remove unnecessary powershell scripts 2022-12-11 18:24:29 +07:00
Orsiris de Jong 87e833d373 Use inline powershell launcher, add unicode support for batch 2022-12-11 18:23:50 +07:00
zadam 9460cfdc55 Merge remote-tracking branch 'origin/master' into next58 2022-12-09 15:18:51 +07:00
zadam 0d06d5ccee dump-db should not contain node_modules in release artifacts 2022-12-04 23:49:16 +07:00
zadam d3bf0c1d8e bookmark migration 2022-12-04 20:05:18 +07:00
zadam b499640db8 use trilium version number in asset paths to avoid caching issues WIP 2022-10-26 23:50:54 +07:00
zadam 01910d3231 flathub release script 2022-10-15 21:09:27 +07:00
zadam 7233f58767 flatpak release script fixes 2022-09-12 23:14:00 +07:00
zadam ca03c41205 flatpak release script should support beta channel 2022-09-12 22:35:22 +07:00
zadam 7109a12afd Merge branch 'stable' 
# Conflicts:
#	bin/release-flatpack.sh
 2022-08-27 13:19:29 +07:00
zadam 700e9fd912 fix release-flatpack.sh 2022-08-26 23:52:09 +07:00
zadam e9090b9154 added a release flatpack script 
(cherry picked from commit e70a7bad1a)
 2022-08-26 22:09:48 +07:00
zadam e70a7bad1a added a release flatpack script 2022-08-23 23:48:13 +07:00
zadam ad8b7f67b1 Merge remote-tracking branch 'origin/master' 2022-08-22 19:27:43 +07:00
zadam df351a8d09 trilium safe mode now disables GPU usage 2022-08-20 22:39:59 +07:00
sigaloid 10676a8d0c Add shareDescription 2022-08-17 15:18:34 +07:00
zadam 53e9c8cdac upgrades 2022-05-24 21:34:32 +07:00
zadam a04becc4ec dep upgrades 2022-04-10 14:13:45 +07:00
zadam 17dd6141fb Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	Dockerfile
#	package-lock.json
#	package.json
#	src/services/cloning.js
 2022-03-22 21:04:30 +07:00
zadam 0cd690d980 fix inclusion of `share.js` in builds, fixes #2738 2022-03-21 23:28:19 +07:00
zadam 5260689b8e include "dump-db" into released artifacts 2022-02-12 22:51:28 +07:00
zadam 97fd550402 add light anonymization option to the existing full anonymization 2022-02-06 13:49:33 +07:00
zadam 1b54596c5e tweaks to handling of branch removal 2022-01-31 22:09:39 +07:00
U-Bren 780b520506
Add powershell equivalents to existing batch scripts (#2561) 
* Add powershell equivalents to existing windows scripts

Each .bat will try to invoke its .ps1 version if powershell is available, or else will fallback on the behavior
previous to this commit.
Should help fix bugs with accents and non-ASCII characters (issue #2327).

* Add powershell equivalents to existing windows scripts

Each .bat will try to invoke its .ps1 version if powershell is available, or else will fallback on the behavior
previous to this commit.
Should help fix bugs with accents and non-ASCII characters (issue #2327).

Co-authored-by: zadam <zadam.apps@gmail.com>
 2022-01-17 23:51:25 +07:00
zadam d1b39ee8fa generate anonymization script into a file 2022-01-17 23:47:26 +07:00
zadam 66a6c76552 generate anonymization script WIP 2022-01-15 22:09:51 +07:00
zadam be59f248e8 fix sync skipping some changes and then forcing sector queuing 2022-01-09 22:22:13 +07:00
zadam cd8c24ceae windows better-sqlite3 binary 2021-12-22 12:58:33 +07:00
zadam 2430dcba65 mac better_sqlite3.node 2021-12-21 22:02:25 +07:00
zadam 630d9f2e45 backlinks improvements, #2349 2021-12-02 22:00:42 +07:00
zadam 87b76abef9 better-sqlite3 binaries 2021-11-18 21:35:23 +07:00
zadam 89322c4b03 upgrade to electron v16 and node v16 2021-11-16 22:43:08 +07:00
zadam 930d29d64a add hack to produce debian compatible XZ compressed deb packages, fixes #2272 2021-11-01 09:11:04 +07:00
zadam 241d1b1035 node 14.18.1 2021-10-14 22:22:27 +07:00
zadam 4111a2f0e8 docker image build/push is now handled by github actions 2021-10-14 20:49:48 +07:00
zadam 0571f02830 updated windows better-sqlite3 binary 2021-10-05 17:32:32 +07:00
zadam fdb7b7721d right context menu on note map 2021-09-24 21:40:02 +07:00
zadam bc1d438075 updated better sqlite 3 binaries 2021-09-23 22:36:12 +07:00
zadam f24ea8137b revert of better sqlite3 dep for server build 2021-09-08 20:56:26 +07:00
zadam 6e300c7cf5 make sure the sorted branches are still sorted after drag & drop, #2142 2021-09-02 23:21:02 +07:00
zadam d27fcaf317 improvements in frontend sync (WIP) 2021-08-24 22:37:00 +07:00
zadam 0ee093f038 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	Dockerfile
#	bin/build-server.sh
#	package-lock.json
#	src/public/app/layouts/mobile_layout.js
 2021-08-23 22:27:19 +07:00
zadam 08eda83700 node update to 14.17.5 2021-08-22 12:25:50 +07:00
zadam 703fbd30df css fixes 2021-07-04 15:49:52 +07:00
zadam b660238a40 backend import unification 2021-06-29 22:15:57 +07:00
zadam 7fcf90437a button changes and book properties 2021-05-27 23:17:13 +07:00
zadam 614b1bdbaf added safe mode scripts 2021-05-27 21:29:23 +07:00
zadam a74741343e upload of modified open file WIP 2021-04-24 11:39:59 +07:00
zadam 30ec706d37 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package.json
#	src/services/build.js
 2021-04-22 21:25:15 +07:00
zadam c27f573eed fix line continuation in the release script 2021-04-22 19:39:57 +07:00
zadam 634baae796 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/services/build.js
 2021-04-19 20:56:56 +07:00
zadam a674a12706 disable tar polluting build log 2021-04-19 20:56:05 +07:00
zadam c29f1af48f use n to force node version 
(cherry picked from commit 51d1d8efb8)
 2021-04-19 20:51:06 +07:00
zadam 51d1d8efb8 use n to force node version 2021-04-19 20:26:58 +07:00
zadam 7b5d44a329 use official `gh` client instead of `github-release` to execute releases 2021-04-18 21:29:10 +07:00
zadam beb42f18fe linux server better-sqlite3 binary 2021-04-10 11:15:13 +07:00
zadam 00a27313fb linux desktop and mac better-sqlite3 binaries 2021-04-09 23:40:42 +07:00
zadam 2d0cb5b66e update electron to 13 beta 2021-04-06 20:19:34 +07:00
zadam 58200d6431 fix dragabilly webpack build 2021-03-29 22:01:01 +07:00
zadam 6a70e0ab97 add trilium-no-cert-check bat/shell file in order to be able to connect to the sync server even without valid server certificate 2021-03-18 23:49:28 +07:00
zadam 70656d240b better-sqlite3 built for electron 12 windows 2021-03-15 23:49:08 +07:00
zadam 5b8e876b77 upgrade to electron 12 2021-03-09 22:36:41 +07:00
zadam 609829653e fix docker build 2020-10-27 19:39:54 +07:00
zadam 1ac1bf12a2 upgrading webpack fixes the issue with broken mobile frontend (and hacky fix which breaks desktop in turn) 2020-10-14 14:20:06 +07:00
zadam c71ac0302a use var instead of const to avoid webpack issue in mobile frontend build, closes #1300 2020-10-10 23:45:38 +07:00
zadam 13b9f5231c similar note tweaks 2020-09-16 17:34:48 +07:00
zadam 11c63b7778 remove test as build step 2020-09-03 23:26:36 +07:00
zadam 30e84321f9 fixes to build 2020-08-27 23:54:02 +07:00
zadam d4e1900f89 cleanup of useless files when building release artifacts 2020-08-27 23:04:00 +07:00
zadam b05b9196a0 fix build with better-sqlite3 binaries 2020-08-26 23:51:30 +07:00
zadam b7947a40ea binaries for better-sqlite3, downgrage to electron 9 since build on windows doesn't for 2020-08-24 20:26:52 +07:00
zadam 46e373e822 "smart" date values can now freely contain whitespaces 2020-08-23 21:53:50 +07:00
zadam 08c612c876 fixed builds for linux desktop 2020-08-22 23:07:31 +07:00
zadam 52e0f838a9 fulltext now ignores archived notes like it used to in the old implementation 2020-08-20 00:15:08 +07:00
zadam b815e10ff3 add running tests into the build process 2020-08-14 22:30:01 +07:00