Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

electron 2.0.9 and other small library updates

Browse Source
This commit is contained in:
azivner
2018-09-10 19:09:05 +02:00
parent b20ff78653
commit b4a566df9e
3 changed files with 994 additions and 3742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4717
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

17
package.json
View File

@@ -26,11 +26,12 @@
"build-docs": "npm run build-backend-docs && npm run build-frontend-docs" "build-docs": "npm run build-backend-docs && npm run build-frontend-docs"
}, },
"dependencies": { "dependencies": {
"@mlink/scrypt": "6.1.2",
"async-mutex": "0.1.3", "async-mutex": "0.1.3",
"axios": "0.18", "axios": "0.18",
"body-parser": "1.18.3", "body-parser": "1.18.3",
"cls-hooked": "4.2.2", "cls-hooked": "4.2.2",
"commonmark": "^0.28.1", "commonmark": "0.28.1",
"cookie-parser": "1.4.3", "cookie-parser": "1.4.3",
"debug": "3.1.0", "debug": "3.1.0",
"devtron": "1.4.0", "devtron": "1.4.0",
@@ -50,7 +51,7 @@
"imagemin-mozjpeg": "7.0.0", "imagemin-mozjpeg": "7.0.0",
"imagemin-pngquant": "6.0.0", "imagemin-pngquant": "6.0.0",
"ini": "1.3.5", "ini": "1.3.5",
"jimp": "0.3.11", "jimp": "0.4.0",
"moment": "2.22.2", "moment": "2.22.2",
"multer": "1.3.1", "multer": "1.3.1",
"open": "0.0.5", "open": "0.0.5",
@@ -62,24 +63,22 @@
"sanitize-filename": "1.6.1", "sanitize-filename": "1.6.1",
"serve-favicon": "2.5.0", "serve-favicon": "2.5.0",
"session-file-store": "1.2.0", "session-file-store": "1.2.0",
"simple-node-logger": "0.93.37", "simple-node-logger": "0.93.40",
"sqlite": "3.0.0", "sqlite": "3.0.0",
"tar-stream": "1.6.1", "tar-stream": "1.6.1",
"turndown": "^5.0.1", "turndown": "5.0.1",
"unescape": "1.0.1", "unescape": "1.0.1",
"ws": "6.0.0", "ws": "6.0.0",
"xml2js": "0.4.19", "xml2js": "0.4.19"
"@mlink/scrypt": "6.1.2"
}, },
"devDependencies": { "devDependencies": {
"electron": "2.0.7", "electron": "2.0.9",
"electron-compile": "6.4.3", "electron-compile": "6.4.3",
"electron-packager": "12.1.1", "electron-packager": "12.1.1",
"electron-prebuilt-compile": "2.0.7",
"electron-rebuild": "1.8.2", "electron-rebuild": "1.8.2",
"lorem-ipsum": "1.0.6", "lorem-ipsum": "1.0.6",
"tape": "4.9.1", "tape": "4.9.1",
"xo": "0.22.0" "xo": "0.23.0"
}, },
"config": { "config": {
"forge": { "forge": {

2
src/services/sql_init.js
View File

@@ -44,7 +44,7 @@ async function isDbInitialized() {
async function initDbConnection() { async function initDbConnection() {
await cls.init(async () => { await cls.init(async () => {
if (!await isDbInitialized()) { if (!await isDbInitialized()) {
log.info("DB not initialized, please visit setup page to initialize Trilium."); log.info("DB not initialized, please visit setup page to see instructions on how to initialize Trilium.");
return; return;
} }