Merge branch 'master' into dev31

This commit is contained in:
zadam
2019-03-13 21:53:41 +01:00
17 changed files with 231 additions and 108 deletions

View File

@@ -79,7 +79,7 @@ $form.submit(() => {
function exportBranch(branchId, type, format, version) {
exportId = utils.randomString(10);
const url = utils.getHost() + `/api/notes/${branchId}/export/${type}/${format}/${version}/${exportId}?protectedSessionId=` + encodeURIComponent(protectedSessionHolder.getProtectedSessionId());
const url = utils.getHost() + `/api/notes/${branchId}/export/${type}/${format}/${version}/${exportId}`;
utils.download(url);
}