diff --git a/package.json b/package.json index a2647a00a..159d1979b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.47.5", + "version": "0.47.6", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/public/app/services/branches.js b/src/public/app/services/branches.js index 51abc605d..c1090998b 100644 --- a/src/public/app/services/branches.js +++ b/src/public/app/services/branches.js @@ -74,8 +74,16 @@ async function deleteNotes(branchIdsToDelete) { return false; } - const deleteNotesDialog = await import("../dialogs/delete_notes.js"); - const {proceed, deleteAllClones} = await deleteNotesDialog.showDialog(branchIdsToDelete); + let proceed, deleteAllClones; + + if (utils.isMobile()) { + proceed = true; + deleteAllClones = false; + } + else { + const deleteNotesDialog = await import("../dialogs/delete_notes.js"); + ({proceed, deleteAllClones} = await deleteNotesDialog.showDialog(branchIdsToDelete)); + } if (!proceed) { return false; diff --git a/src/services/build.js b/src/services/build.js index 9a75f322a..58cb471c6 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2021-06-25T21:26:48+02:00", buildRevision: "0a2807c0b3fb7809d1cd1be3a051d127db010b5e" }; +module.exports = { buildDate:"2021-08-21T20:56:58+02:00", buildRevision: "3fd16a16e8c944882626a019dd6e47448ec94169" }; diff --git a/src/services/html_sanitizer.js b/src/services/html_sanitizer.js index 2f434e645..84948cca9 100644 --- a/src/services/html_sanitizer.js +++ b/src/services/html_sanitizer.js @@ -6,7 +6,7 @@ function sanitize(dirtyHtml) { return sanitizeHtml(dirtyHtml, { allowedTags: [ 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote', 'p', 'a', 'ul', 'ol', - 'li', 'b', 'i', 'strong', 'em', 'strike', 'abbr', 'code', 'hr', 'br', 'div', + 'li', 'b', 'i', 'strong', 'em', 'strike', 's', 'del', 'abbr', 'code', 'hr', 'br', 'div', 'table', 'thead', 'caption', 'tbody', 'tr', 'th', 'td', 'pre', 'section', 'img', 'figure', 'figcaption', 'span', 'label', 'input' ],