diff --git a/package-lock.json b/package-lock.json
index 871603bab..30c6b8511 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -795,27 +795,27 @@
"integrity": "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="
},
"app-builder-bin": {
- "version": "3.4.2",
- "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.4.2.tgz",
- "integrity": "sha512-E9VvUrZm60oLl0rvLw/ErvZiEOIHkulZbJ9C9TWMD4ftNrkXFc2+a5JGlD19Bwvj329d4qz91zs/hWD01q18TQ==",
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.4.3.tgz",
+ "integrity": "sha512-qMhayIwi3juerQEVJMQ76trObEbfQT0nhUdxZz9a26/3NLT3pE6awmQ8S1cEnrGugaaM5gYqR8OElcDezfmEsg==",
"dev": true
},
"app-builder-lib": {
- "version": "21.1.5",
- "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-21.1.5.tgz",
- "integrity": "sha512-hLsSVSstMTq33a9jbBStrF0e+fa6eWXWIpsatPvHnJlkjx7dAZ5d2cZPe/1bAO3bCL3afpRl5j+HU853eGfDCg==",
+ "version": "21.2.0",
+ "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-21.2.0.tgz",
+ "integrity": "sha512-aOX/nv77/Bti6NymJDg7p9T067xD8m1ipIEJR7B4Mm1GsJWpMm9PZdXtCRiMNRjHtQS5KIljT0g17781y6qn5A==",
"dev": true,
"requires": {
"7zip-bin": "~5.0.3",
"@develar/schema-utils": "~2.1.0",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.9",
- "builder-util": "21.1.5",
+ "builder-util": "21.2.0",
"builder-util-runtime": "8.3.0",
"chromium-pickle-js": "^0.2.0",
"debug": "^4.1.1",
"ejs": "^2.6.2",
- "electron-publish": "21.1.5",
+ "electron-publish": "21.2.0",
"fs-extra": "^8.1.0",
"hosted-git-info": "^2.7.1",
"is-ci": "^2.0.0",
@@ -825,7 +825,7 @@
"minimatch": "^3.0.4",
"normalize-package-data": "^2.5.0",
"read-config-file": "5.0.0",
- "sanitize-filename": "^1.6.1",
+ "sanitize-filename": "^1.6.2",
"semver": "^6.3.0",
"temp-file": "^3.3.4"
},
@@ -889,12 +889,6 @@
"requires": {
"path-parse": "^1.0.6"
}
- },
- "semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
- "dev": true
}
}
},
@@ -1609,14 +1603,14 @@
}
},
"builder-util": {
- "version": "21.1.5",
- "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-21.1.5.tgz",
- "integrity": "sha512-RBr06OnoTKTkg0W7Om2dnuKe8I82CiciU9EdsNnLO8DAfH0ZVCPsVpc3qYmr7g/7cH3zXA3yyQP73QDGNpbVYQ==",
+ "version": "21.2.0",
+ "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-21.2.0.tgz",
+ "integrity": "sha512-Nd6CUb6YgDY8EXAXEIegx+1kzKqyFQ5ZM5BoYkeunAlwz/zDJoH1UCyULjoS5wQe5czNClFQy07zz2bzYD0Z4A==",
"dev": true,
"requires": {
"7zip-bin": "~5.0.3",
"@types/debug": "^4.1.4",
- "app-builder-bin": "3.4.2",
+ "app-builder-bin": "3.4.3",
"bluebird-lst": "^1.0.9",
"builder-util-runtime": "8.3.0",
"chalk": "^2.4.2",
@@ -1624,7 +1618,7 @@
"fs-extra": "^8.1.0",
"is-ci": "^2.0.0",
"js-yaml": "^3.13.1",
- "source-map-support": "^0.5.12",
+ "source-map-support": "^0.5.13",
"stat-mode": "^0.3.0",
"temp-file": "^3.3.4"
},
@@ -2901,18 +2895,18 @@
}
},
"dmg-builder": {
- "version": "21.1.5",
- "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-21.1.5.tgz",
- "integrity": "sha512-o9rZua7mzNzZIo9SZJi57ZXe4zjNaajxEJ0LO/8k2z8Q2CL57RIaJZ95sA6G0dC1/g5Gm4cmW3O5nv9Ur8Ayow==",
+ "version": "21.2.0",
+ "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-21.2.0.tgz",
+ "integrity": "sha512-9cJEclnGy7EyKFCoHDYDf54pub/t92CQapyiUxU0w9Bj2vUvfoDagP1PMiX4XD5rPp96141h9A+QN0OB4VgvQg==",
"dev": true,
"requires": {
- "app-builder-lib": "~21.1.5",
+ "app-builder-lib": "~21.2.0",
"bluebird-lst": "^1.0.9",
- "builder-util": "~21.1.5",
+ "builder-util": "~21.2.0",
"fs-extra": "^8.1.0",
"iconv-lite": "^0.5.0",
"js-yaml": "^3.13.1",
- "sanitize-filename": "^1.6.1"
+ "sanitize-filename": "^1.6.2"
},
"dependencies": {
"esprima": {
@@ -3119,22 +3113,22 @@
}
},
"electron-builder": {
- "version": "21.1.5",
- "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-21.1.5.tgz",
- "integrity": "sha512-2tEgBESGWQ661dC9/rZlpbtmhlofoNPwnkO6KUuCZUBYpFMRvpMzH2IF7vQYsCst78yxnrV0CtiBePhM1i+DfA==",
+ "version": "21.2.0",
+ "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-21.2.0.tgz",
+ "integrity": "sha512-x8EXrqFbAb2L3N22YlGar3dGh8vwptbB3ovo3OF6K7NTpcsmM2zEoJv7GhFyX73rNzSG2HaWpXwGAtOp2JWiEw==",
"dev": true,
"requires": {
- "app-builder-lib": "21.1.5",
+ "app-builder-lib": "21.2.0",
"bluebird-lst": "^1.0.9",
- "builder-util": "21.1.5",
+ "builder-util": "21.2.0",
"builder-util-runtime": "8.3.0",
"chalk": "^2.4.2",
- "dmg-builder": "21.1.5",
+ "dmg-builder": "21.2.0",
"fs-extra": "^8.1.0",
"is-ci": "^2.0.0",
"lazy-val": "^1.0.4",
"read-config-file": "5.0.0",
- "sanitize-filename": "^1.6.1",
+ "sanitize-filename": "^1.6.2",
"update-notifier": "^3.0.1",
"yargs": "^13.3.0"
},
@@ -3932,13 +3926,13 @@
}
},
"electron-publish": {
- "version": "21.1.5",
- "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-21.1.5.tgz",
- "integrity": "sha512-EgFxZJBrb+EBUcEwg8RNKouoBaOEpACnjLi+ipUsk72x+/6kzhcofAYBchIkGns7meengoXy7QdoiThgpr6rew==",
+ "version": "21.2.0",
+ "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-21.2.0.tgz",
+ "integrity": "sha512-mWavuoWJe87iaeKd0I24dNWIaR+0yRzshjNVqGyK019H766fsPWl3caQJnVKFaEyrZRP397v4JZVG0e7s16AxA==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.9",
- "builder-util": "~21.1.5",
+ "builder-util": "~21.2.0",
"builder-util-runtime": "8.3.0",
"chalk": "^2.4.2",
"fs-extra": "^8.1.0",
@@ -5457,9 +5451,9 @@
}
},
"file-type": {
- "version": "12.0.1",
- "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.0.1.tgz",
- "integrity": "sha512-YIs1E51cmqcmgF38ODjy0+M/l5DyfIIy3vngTOujQr/lXqkaSskfBniaZoZ1HVIpa5FTf5e7hCXS4TzxfNGMRQ=="
+ "version": "12.1.0",
+ "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.1.0.tgz",
+ "integrity": "sha512-aZkf42yWGiH+vSOpbVgvbnoRuX4JiitMX9pHYqTHemNQ3lrx64iHi33YGAP7TSJSno56kxQY1lHmw8S6ujlFUg=="
},
"filename-regex": {
"version": "2.0.1",
@@ -11391,9 +11385,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"sanitize-filename": {
- "version": "1.6.1",
- "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz",
- "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=",
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.2.tgz",
+ "integrity": "sha512-cmTzND7RMxUB+f7gI+4+KAVHWEg0lfXvQJdko+FXDP5bNbGIdx4KMP5pX6lv5jfT9jSf6OBbjyxjFtZQwYA/ig==",
"requires": {
"truncate-utf8-bytes": "^1.0.0"
}
@@ -11834,9 +11828,9 @@
}
},
"source-map-support": {
- "version": "0.5.12",
- "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
- "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+ "version": "0.5.13",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+ "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
"dev": true,
"requires": {
"buffer-from": "^1.0.0",
@@ -13323,9 +13317,9 @@
}
},
"ws": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.1.0.tgz",
- "integrity": "sha512-Swie2C4fs7CkwlHu1glMePLYJJsWjzhl1vm3ZaLplD0h7OMkZyZ6kLTB/OagiU923bZrPFXuDTeEqaEN4NWG4g==",
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.1.1.tgz",
+ "integrity": "sha512-o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A==",
"requires": {
"async-limiter": "^1.0.0"
}
diff --git a/package.json b/package.json
index b5836913b..b68999d86 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"electron-window-state": "5.0.3",
"express": "4.17.1",
"express-session": "1.16.2",
- "file-type": "12.0.1",
+ "file-type": "12.1.0",
"fs-extra": "8.1.0",
"helmet": "3.20.0",
"html": "1.0.0",
@@ -55,14 +55,14 @@
"mime-types": "2.1.24",
"moment": "2.24.0",
"multer": "1.4.2",
- "node-abi": "2.9.0",
+ "node-abi": "2.10.0",
"open": "6.4.0",
"pngjs": "3.4.0",
"portscanner": "2.2.0",
"rand-token": "0.4.0",
"rcedit": "2.0.0",
"rimraf": "2.6.3",
- "sanitize-filename": "1.6.1",
+ "sanitize-filename": "1.6.2",
"sax": "1.2.4",
"semver": "6.3.0",
"serve-favicon": "2.5.0",
@@ -73,16 +73,16 @@
"tar-stream": "2.1.0",
"turndown": "5.0.3",
"unescape": "1.0.1",
- "ws": "7.1.0",
+ "ws": "7.1.1",
"xml2js": "0.4.19"
},
"devDependencies": {
"devtron": "1.4.0",
- "electron": "6.0.0-beta.14",
- "electron-builder": "21.1.5",
+ "electron": "6.0.0",
+ "electron-builder": "21.2.0",
"electron-compile": "6.4.4",
"electron-installer-debian": "2.0.0",
- "electron-packager": "14.0.2",
+ "electron-packager": "14.0.4",
"electron-rebuild": "1.8.5",
"lorem-ipsum": "2.0.3",
"xo": "0.24.0"
diff --git a/src/views/dialogs/note_revisions.ejs b/src/views/dialogs/note_revisions.ejs
index 3e9d67821..5d136a479 100644
--- a/src/views/dialogs/note_revisions.ejs
+++ b/src/views/dialogs/note_revisions.ejs
@@ -19,7 +19,7 @@
-
+