zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-02-24 15:05:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse source 
# Conflicts:
#	package-lock.json
This commit is contained in:
zadam 2021-08-21 21:32:11 +02:00
commit 8cb07525cf
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -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": {

12
src/public/app/services/branches.js
View file

@ -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;

2
src/services/build.js
View file

@ -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" };

2
src/services/html_sanitizer.js
View file

@ -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'
],