Merge branch 'release/v8.3.0' into develop

# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/nodejs/public/assets/document-formats
#	web/documentserver-example/nodejs/views/editor.ejs

CHANGELOG.md

@@ -1,9 +1,6 @@
 # Change Log
 
-- restore by url
 - nodejs: support vsdx in diagram editor
-- nodejs: support pages, numbers, key formats
-- nodejs: support hwp, hwpx formats
 - golang: new integration example
 - golang: upload files to the server
 - golang: create blank files and files with sample content
@@ -18,6 +15,7 @@
 - php-laravel: create, edit, and submit pdf forms
 - php-laravel: show forgotten files on a seperate page
 - php-laravel: fetch files
+- restore by url
 - refresh config
 - on uploading xml convert to supported type only
 - converting function on index page
@@ -25,7 +23,12 @@
 - change reference source
 - filename in editor page title
 - close editor
-- sq-AL skin languages
+
+## 1.12.0
+- nodejs: refresh config
+- nodejs: support pages, numbers, key formats
+- nodejs: support hwp, hwpx formats
+- sq-AL skin language
 
 ## 1.11.0
 - he-IL skin language

web/documentserver-example/csharp-mvc/web.appsettings.config

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <appSettings>
   <clear />
-  <add key="version" value="1.11.0"/>
+  <add key="version" value="1.12.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>

web/documentserver-example/csharp/settings.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <appSettings>
   <clear />
-  <add key="version" value="1.11.0"/>
+  <add key="version" value="1.12.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>

web/documentserver-example/java-spring/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-server.version=1.11.0
+server.version=1.12.0
 
 server.address=
 server.port=4000

web/documentserver-example/java/src/main/resources/settings.properties

@@ -1,4 +1,4 @@
-version=1.11.0
+version=1.12.0
 
 filesize-max=5242880
 storage-folder=app_data

web/documentserver-example/nodejs/config/default.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.11.0",
+  "version": "1.12.0",
   "log": {
     "appenders": [
       {

web/documentserver-example/php/src/configuration/ConfigurationManager.php

@@ -22,7 +22,7 @@ use Example\Common\URL;
 
 class ConfigurationManager
 {
-    public string $version = '1.11.0';
+    public string $version = '1.12.0';
 
     public function getVersion(): string
     {

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

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

web/documentserver-example/ruby/app/configuration/configuration.rb

@@ -31,7 +31,7 @@ class ConfigurationManager
 
   sig { void }
   def initialize
-    @version = '1.11.0'
+    @version = '1.12.0'
   end
 
   sig { returns(T.nilable(URI::Generic)) }