Merge branch 'master' into next61

# Conflicts:
#	package-lock.json
#	src/public/app/services/note_content_renderer.js
#	src/public/app/widgets/note_tree.js
#	src/routes/routes.js
#	src/services/consistency_checks.js
#	src/services/notes.js
#	src/services/task_context.js
This commit is contained in:
zadam
2023-07-10 18:20:36 +02:00
41 changed files with 253 additions and 192 deletions
+2 -2
View File
@@ -231,7 +231,7 @@ paths:
schema:
$ref: '#/components/schemas/EntityId'
get:
description: Returns note content idenfied by its ID
description: Returns note content identified by its ID
operationId: getNoteContent
responses:
'200':
@@ -241,7 +241,7 @@ paths:
schema:
type: string
put:
description: Updates note content idenfied by its ID
description: Updates note content identified by its ID
operationId: putNoteContentById
requestBody:
description: html content of note