From bc669c7b818cc383106b8371d701aa82e3c00ece Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Mon, 3 Sep 2018 21:06:24 +0200
Subject: [PATCH] markdown wiki reference on README

---
 README.md                                 | 1 +
 package-lock.json                         | 2 +-
 src/public/javascripts/services/export.js | 3 +++
 src/routes/api/import.js                  | 4 ++++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b00756f1b..8eb9a874a 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ See other pictures in [screenshot tour](https://github.com/zadam/trilium/wiki/Sc
 * [Scripting](https://github.com/zadam/trilium/wiki/Scripts) - see [Advanced showcases](https://github.com/zadam/trilium/wiki/Advanced-showcases)
 * Scales well in both usability and performance upwards of 100 000 notes
 * [Night theme](https://github.com/zadam/trilium/wiki/Themes)
+* [Markdown import & export](https://github.com/zadam/trilium/wiki/Markdown)
 
 ## Builds
 
diff --git a/package-lock.json b/package-lock.json
index 5ae762d9c..ad8f5fb17 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.20.2",
+  "version": "0.21.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/public/javascripts/services/export.js b/src/public/javascripts/services/export.js
index 8913a7cf8..89c9d6eaa 100644
--- a/src/public/javascripts/services/export.js
+++ b/src/public/javascripts/services/export.js
@@ -1,4 +1,5 @@
 import treeService from './tree.js';
+import infoService from './info.js';
 import protectedSessionHolder from './protected_session_holder.js';
 import utils from './utils.js';
 import server from './server.js';
@@ -8,6 +9,8 @@ function exportSubtree(noteId, format) {
         "?protectedSessionId=" + encodeURIComponent(protectedSessionHolder.getProtectedSessionId());
 
     utils.download(url);
+
+    infoService.showMessage("Export to file has been finished.");
 }
 
 let importNoteId;
diff --git a/src/routes/api/import.js b/src/routes/api/import.js
index 09b888764..d6209f357 100644
--- a/src/routes/api/import.js
+++ b/src/routes/api/import.js
@@ -15,6 +15,10 @@ async function importToBranch(req) {
     const parentNoteId = req.params.parentNoteId;
     const file = req.file;
 
+    if (file) {
+        return [400, "No file has been uploaded"];
+    }
+
     const parentNote = await repository.getNote(parentNoteId);
 
     if (!parentNote) {