gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into next50

Browse Source 
# Conflicts:
#	package-lock.json
This commit is contained in:
zadam 2022-01-04 22:11:00 +01:00
commit e8acf3f9f3
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "trilium",
"version": "0.49.1-beta",
"version": "0.49.2-beta",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "trilium",
"version": "0.49.1-beta",
"version": "0.49.2-beta",
"license": "AGPL-3.0-only",
"dependencies": {
"@electron/remote": "2.0.1",
@ -71,7 +71,7 @@
},
"devDependencies": {
"cross-env": "7.0.3",
"electron": "16.0.5",
"electron": "16.0.6",
"electron-builder": "22.14.5",
"electron-packager": "15.4.0",
"electron-rebuild": "3.2.5",
@ -3713,9 +3713,9 @@
}
},
"node_modules/electron": {
"version": "16.0.5",
"resolved": "https://registry.npmjs.org/electron/-/electron-16.0.5.tgz",
"integrity": "sha512-TgQXWmEGQ3uH2P2JDq5GyJDEu/fimRgqp1iNisARtGreU1k3630PqWlR+4SPnSEHN9NuSv92ng6NWxtefeFzxg==",
"version": "16.0.6",
"resolved": "https://registry.npmjs.org/electron/-/electron-16.0.6.tgz",
"integrity": "sha512-Xs9dYLYhcJf3wXn8m2gDqFTb1L862KEhMxOx9swfFBHj6NoUPPtUgw/RyPQ0tXN1XPxG9vnBkoI0BdcKwrLKuQ==",
"hasInstallScript": true,
"dependencies": {
"@electron/get": "^1.13.0",
@ -14169,9 +14169,9 @@
}
},
"electron": {
"version": "16.0.5",
"resolved": "https://registry.npmjs.org/electron/-/electron-16.0.5.tgz",
"integrity": "sha512-TgQXWmEGQ3uH2P2JDq5GyJDEu/fimRgqp1iNisARtGreU1k3630PqWlR+4SPnSEHN9NuSv92ng6NWxtefeFzxg==",
"version": "16.0.6",
"resolved": "https://registry.npmjs.org/electron/-/electron-16.0.6.tgz",
"integrity": "sha512-Xs9dYLYhcJf3wXn8m2gDqFTb1L862KEhMxOx9swfFBHj6NoUPPtUgw/RyPQ0tXN1XPxG9vnBkoI0BdcKwrLKuQ==",
"requires": {
"@electron/get": "^1.13.0",
"@types/node": "^14.6.2",

2
package.json
View File

@ -83,7 +83,7 @@
},
"devDependencies": {
"cross-env": "7.0.3",
"electron": "16.0.5",
"electron": "16.0.6",
"electron-builder": "22.14.5",
"electron-packager": "15.4.0",
"electron-rebuild": "3.2.5",

1
src/public/app/widgets/sync_status.js
View File

@ -1,5 +1,4 @@
import BasicWidget from "./basic_widget.js";
import toastService from "../services/toast.js";
import ws from "../services/ws.js";
import options from "../services/options.js";
import syncService from "../services/sync.js";

2
src/services/backend_script_api.js
View File

@ -161,7 +161,7 @@ function BackendScriptApi(currentNote, apiParams) {
* @param {boolean} present - true if we want the branch to exist, false if we want it gone
* @param {string} noteId
* @param {string} parentNoteId
* @param {string} prefix - if branch will be create between note and parent note, set this prefix
* @param {string} prefix - if branch will be created between note and parent note, set this prefix
* @returns {void}
*/
this.toggleNoteInParent = cloningService.toggleNoteInParent;