diff --git a/package.json b/package.json index 6142dcecd..70cbf1a1d 100644 --- a/package.json +++ b/package.json @@ -45,12 +45,12 @@ "@types/gulp-typescript": "0.0.32", "@types/gulp-uglify": "0.0.30", "@types/gulp-util": "3.0.31", - "@types/inquirer": "0.0.32", + "@types/inquirer": "0.0.34", "@types/is-root": "1.0.0", "@types/is-url": "1.2.28", "@types/js-yaml": "3.5.30", "@types/mocha": "2.2.40", - "@types/mongodb": "2.1.43", + "@types/mongodb": "2.2.0", "@types/monk": "1.0.5", "@types/morgan": "1.7.32", "@types/ms": "0.7.29", @@ -62,7 +62,7 @@ "@types/riot": "2.6.2", "@types/serve-favicon": "2.2.28", "@types/uuid": "2.0.29", - "@types/webpack": "2.2.14", + "@types/webpack": "2.2.15", "@types/webpack-stream": "3.2.6", "@types/websocket": "0.0.33", "chai": "3.5.0", @@ -72,7 +72,7 @@ "gulp": "3.9.1", "gulp-cssnano": "2.1.2", "gulp-imagemin": "3.2.0", - "gulp-mocha": "4.3.0", + "gulp-mocha": "4.3.1", "gulp-pug": "3.3.0", "gulp-rename": "1.2.2", "gulp-replace": "0.5.4", @@ -102,10 +102,10 @@ "cors": "2.8.3", "cropperjs": "1.0.0-rc", "crypto": "0.0.3", - "debug": "2.6.4", + "debug": "2.6.6", "deep-equal": "1.0.1", "deepcopy": "0.6.3", - "download": "5.0.3", + "download": "6.0.0", "elasticsearch": "13.0.0", "escape-html": "1.0.3", "escape-regexp": "0.0.1", @@ -135,7 +135,7 @@ "redis": "2.7.1", "request": "2.81.0", "rimraf": "2.6.1", - "riot": "3.4.2", + "riot": "3.4.3", "rndstr": "1.0.0", "s-age": "1.1.0", "serve-favicon": "2.4.2", @@ -145,7 +145,7 @@ "tcp-port-used": "0.1.2", "textarea-caret": "3.0.2", "ts-node": "3.0.1", - "typescript": "2.2.2", + "typescript": "2.3.1", "uuid": "3.0.1", "vhost": "3.0.2", "websocket": "1.0.24", diff --git a/src/web/app/desktop/tags/drive/browser.tag b/src/web/app/desktop/tags/drive/browser.tag index d121d4736..586bc47a9 100644 --- a/src/web/app/desktop/tags/drive/browser.tag +++ b/src/web/app/desktop/tags/drive/browser.tag @@ -4,7 +4,9 @@ - { folder.name } + + + { folder.name } @@ -477,7 +479,9 @@ }; this.urlUpload = () => { - inputDialog('%i18n:desktop.tags.mk-drive-browser.url-upload%', '%i18n:desktop.tags.mk-drive-browser.url-of-file%', null, url => { + inputDialog('%i18n:desktop.tags.mk-drive-browser.url-upload%', + '%i18n:desktop.tags.mk-drive-browser.url-of-file%', null, url => { + this.api('drive/files/upload_from_url', { url: url, folder_id: this.folder ? this.folder.id : undefined @@ -491,7 +495,9 @@ }; this.createFolder = () => { - inputDialog('%i18n:desktop.tags.mk-drive-browser.create-folder%', '%i18n:desktop.tags.mk-drive-browser.folder-name%', null, name => { + inputDialog('%i18n:desktop.tags.mk-drive-browser.create-folder%', + '%i18n:desktop.tags.mk-drive-browser.folder-name%', null, name => { + this.api('drive/folders/create', { name: name, folder_id: this.folder ? this.folder.id : undefined