pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v8.3.0' into develop

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/nodejs/public/assets/document-formats
#	web/documentserver-example/nodejs/views/editor.ejs
This commit is contained in:
Sergey Linnik
2025-01-31 13:36:37 +03:00
parent 383e2dcaba ad3e6bbe15
commit 41fd4d9e92
9 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CHANGELOG.md
View File

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

2
web/documentserver-example/csharp-mvc/web.appsettings.config
View File

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

2
web/documentserver-example/csharp/settings.config
View File

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

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

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

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

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

2
web/documentserver-example/nodejs/config/default.json
View File

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

2
web/documentserver-example/php/src/configuration/ConfigurationManager.php
View File

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

2
web/documentserver-example/python/src/configuration/configuration.py
View File

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

2
web/documentserver-example/ruby/app/configuration/configuration.rb
View File

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