Merge branch 'stable'

This commit is contained in:
azivner
2018-02-15 23:24:02 -05:00
5 changed files with 53 additions and 49 deletions
+4 -2
View File
@@ -207,9 +207,11 @@ if (isElectron()) {
await noteTree.activateNode(parentNoteId);
const node = noteTree.getCurrentNode();
setTimeout(() => {
const node = noteTree.getCurrentNode();
await noteTree.createNote(node, node.data.noteId, 'into', node.data.isProtected);
noteTree.createNote(node, node.data.noteId, 'into', node.data.isProtected);
}, 500);
});
}
+1 -1
View File
@@ -22,7 +22,7 @@ function info(message) {
function error(message) {
// we're using .info() instead of .error() because simple-node-logger emits weird error for showError()
info(message);
info("ERROR: " + message);
}
const requestBlacklist = [ "/libraries", "/javascripts", "/images", "/stylesheets" ];