Merge remote-tracking branch 'remotes/origin/develop' into feature/diagrams-editor

# Conflicts:
#	.gitmodules
#	CHANGELOG.md

web/documentserver-example/python/src/configuration/configuration.py

@@ -22,7 +22,7 @@ from src.common import string
 
 
 class ConfigurationManager:
-    version = '1.12.0'
+    version = '1.13.0'
 
     def getVersion(self) -> str:
         return self.version

web/documentserver-example/python/templates/editor.html

@@ -107,6 +107,10 @@
             innerAlert("Document editor closed successfully");
         };
 
+        var onUserActionRequired = function () {
+            console.log("User action required");
+        };
+
         // the meta information of the document is changed via the meta command
         var onMetaChange = function (event) {
             if (event.data.favorite !== undefined) {
@@ -367,6 +371,7 @@
             config.events = {
                 'onAppReady': onAppReady,
                 'onDocumentStateChange': onDocumentStateChange,
+                'onUserActionRequired': onUserActionRequired,
                 'onError': onError,
                 'onOutdatedVersion': onOutdatedVersion,
                 'onMakeActionLink': onMakeActionLink,