From ef974ab1f5e16d4a64b15a6d6cd008428b994357 Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 24 Oct 2023 23:00:46 +0200 Subject: [PATCH 1/3] add shell as enabled by default #4347 --- src/services/options_init.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/options_init.js b/src/services/options_init.js index 7ed31b343..d601353af 100644 --- a/src/services/options_init.js +++ b/src/services/options_init.js @@ -63,7 +63,7 @@ const defaultOptions = [ { name: 'autoFixConsistencyIssues', value: 'true', isSynced: false }, { name: 'vimKeymapEnabled', value: 'false', isSynced: false }, { name: 'codeLineWrapEnabled', value: 'true', isSynced: false }, - { name: 'codeNotesMimeTypes', value: '["text/x-csrc","text/x-c++src","text/x-csharp","text/css","text/x-go","text/x-groovy","text/x-haskell","text/html","message/http","text/x-java","application/javascript;env=frontend","application/javascript;env=backend","application/json","text/x-kotlin","text/x-markdown","text/x-perl","text/x-php","text/x-python","text/x-ruby",null,"text/x-sql","text/x-sqlite;schema=trilium","text/x-swift","text/xml","text/x-yaml"]', isSynced: true }, + { name: 'codeNotesMimeTypes', value: '["text/x-csrc","text/x-c++src","text/x-csharp","text/css","text/x-go","text/x-groovy","text/x-haskell","text/html","message/http","text/x-java","application/javascript;env=frontend","application/javascript;env=backend","application/json","text/x-kotlin","text/x-markdown","text/x-perl","text/x-php","text/x-python","text/x-ruby",null,"text/x-sql","text/x-sqlite;schema=trilium","text/x-swift","text/xml","text/x-yaml","text/x-sh"]', isSynced: true }, { name: 'leftPaneWidth', value: '25', isSynced: false }, { name: 'leftPaneVisible', value: 'true', isSynced: false }, { name: 'rightPaneWidth', value: '25', isSynced: false }, From ed1a731950ed1ef94d8cc293862ec0122c1deca4 Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 24 Oct 2023 23:15:18 +0200 Subject: [PATCH 2/3] extra hint on "noproxy directly in the setting", #3934 --- src/public/app/widgets/type_widgets/options/sync.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/public/app/widgets/type_widgets/options/sync.js b/src/public/app/widgets/type_widgets/options/sync.js index 01b0e29ee..3f7ad72b6 100644 --- a/src/public/app/widgets/type_widgets/options/sync.js +++ b/src/public/app/widgets/type_widgets/options/sync.js @@ -21,7 +21,8 @@ const TPL = ` -

Note: If you leave the proxy setting blank, the system proxy will be used (applies to desktop/electron build only)

+

Note: If you leave the proxy setting blank, the system proxy will be used (applies to desktop/electron build only).

+

Another special value is noproxy which forces ignoring even the system proxy and respectes NODE_TLS_REJECT_UNAUTHORIZED.

From a9b63111ae01c1084458072b56ee8c5240186be7 Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 29 Oct 2023 16:42:30 +0100 Subject: [PATCH 3/3] qstart-electron, qstart-server npm scripts --- package-lock.json | 4 ++-- package.json | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6f7731af6..d94058c5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "trilium", - "version": "0.61.9-beta", + "version": "0.61.10-beta", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "trilium", - "version": "0.61.9-beta", + "version": "0.61.10-beta", "hasInstallScript": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index e564e24b0..87277b557 100644 --- a/package.json +++ b/package.json @@ -15,12 +15,14 @@ "scripts": { "start-server": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon ./src/www", "start-server-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon ./src/www", + "qstart-server": "rm -r ./node_modules/better-sqlite3/bin ; mkdir -p ./node_modules/better-sqlite3/build ; cp ./bin/better-sqlite3/linux-server-better_sqlite3.node ./node_modules/better-sqlite3/build/better_sqlite3.node && TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon ./src/www", "start-electron": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron --inspect=5858 .", "start-electron-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 electron --inspect=5858 .", + "qstart-electron": "rm -r ./node_modules/better-sqlite3/bin ; mkdir -p ./node_modules/better-sqlite3/build ; cp ./bin/better-sqlite3/linux-desktop-better_sqlite3.node ./node_modules/better-sqlite3/build/better_sqlite3.node && TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron --inspect=5858 .", "switch-server": "rm -rf ./node_modules/better-sqlite3 && npm install", "switch-electron": "./node_modules/.bin/electron-rebuild", "build-backend-docs": "rm -rf ./docs/backend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/backend_api src/becca/entities/*.js src/services/backend_script_api.js src/services/sql.js", - "build-frontend-docs": "rm -rf ./docs/frontend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/app/entities/*.js src/public/app/services/frontend_script_api.js src/public/app/widgets/right_panel_widget.js", + "build-frontend-docs": "rm -rf ./docs/frontend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/app/entities/*.js src/public/app/services/frontend_script_api.js src/public/app/widgets/basic_widget.js src/public/app/widgets/note_context_aware_widget.js src/public/app/widgets/right_panel_widget.js", "build-docs": "npm run build-backend-docs && npm run build-frontend-docs", "webpack": "webpack -c webpack.config.js", "test-jasmine": "jasmine",