Skip to content

Commit 8701cc5

Browse files
LinneySLinneyS
committed
Merge pull request 'release/1.14.0' from release/1.14.0 into master
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/69
2 parents 4af422a + f231b1c commit 8701cc5

29 files changed

Lines changed: 125 additions & 78 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Change Log
22

3+
## 1.14.0
4+
- nodejs: set users by parts
5+
- nodejs: preload frame moved from uploading popap
6+
- nodejs: view odg, md
7+
- nodejs: edit xlsb
8+
- nodejs: support vsdx in diagram editor
9+
- nodejs: fix wopi verification
10+
- nodejs: user role
11+
- nodejs: start filling
12+
- ur skin language
13+
- change preload.html address
14+
315
## 1.13.0
416
- nodejs: rename in wopi
517
- nodejs: using faviconUrl from WOPI discovery

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<appSettings>
33
<clear />
4-
<add key="version" value="1.13.0"/>
4+
<add key="version" value="1.14.0"/>
55

66
<add key="filesize-max" value="52428800"/>
77
<add key="storage-path" value=""/>
@@ -17,13 +17,13 @@
1717

1818
<add key="files.docservice.verify-peer-off" value="true"/>
1919

20-
<add key="files.docservice.languages" value="en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language"/>
20+
<add key="files.docservice.languages" value="en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|ur:Urdu|vi:Vietnamese|aa-AA:Test Language"/>
2121

2222
<add key="files.docservice.url.site" value="http://documentserver/"/>
2323

2424
<add key="files.docservice.url.converter" value="converter"/>
2525
<add key="files.docservice.url.api" value="web-apps/apps/api/documents/api.js"/>
26-
<add key="files.docservice.url.preloader" value="web-apps/apps/api/documents/cache-scripts.html"/>
26+
<add key="files.docservice.url.preloader" value="web-apps/apps/api/documents/preload.html"/>
2727
<add key="files.docservice.url.command" value="command"/>
2828

2929
<add key="files.docservice.url.example" value=""/>

‎web/documentserver-example/csharp/settings.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<appSettings>
33
<clear />
4-
<add key="version" value="1.13.0"/>
4+
<add key="version" value="1.14.0"/>
55

66
<add key="filesize-max" value="52428800"/>
77
<add key="storage-path" value=""/>
@@ -16,13 +16,13 @@
1616
<add key="files.docservice.token.useforrequest" value="true" />
1717
<add key="files.docservice.token.expires-in" value="5"/>
1818

19-
<add key="files.docservice.languages" value="en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
19+
<add key="files.docservice.languages" value="en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|ur:Urdu|vi:Vietnamese|aa-AA: Test Language"/>
2020

2121
<add key="files.docservice.url.site" value="http://documentserver/"/>
2222

2323
<add key="files.docservice.url.converter" value="converter"/>
2424
<add key="files.docservice.url.api" value="web-apps/apps/api/documents/api.js"/>
25-
<add key="files.docservice.url.preloader" value="web-apps/apps/api/documents/cache-scripts.html"/>
25+
<add key="files.docservice.url.preloader" value="web-apps/apps/api/documents/preload.html"/>
2626
<add key="files.docservice.url.command" value="command"/>
2727

2828
<add key="files.docservice.url.example" value=""/>

‎web/documentserver-example/go/config/configuration.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"VERSION": "1.13.0",
2+
"VERSION": "1.14.0",
33

44
"SERVER_ADDRESS" : "",
55
"SERVER_PORT" : 3000,
66

77
"DOC_SERVER_HOST" : "http://documentserver/",
88
"DOC_SERVER_CONVERTER_URL" : "converter",
99
"DOC_SERVER_API_URL" : "web-apps/apps/api/documents/api.js",
10-
"DOC_SERVER_PRELOADER_URL" : "web-apps/apps/api/documents/cache-scripts.html",
10+
"DOC_SERVER_PRELOADER_URL" : "web-apps/apps/api/documents/preload.html",
1111
"DOC_SERVER_COMMAND_URL" : "command",
1212

1313
"JWT_IS_ENABLED" : false,
@@ -67,6 +67,7 @@
6767
"sv": "Swedish",
6868
"tr": "Turkish",
6969
"uk": "Ukrainian",
70+
"ur": "Urdu",
7071
"vi": "Vietnamese",
7172
"aa-AA": "Test Language"
7273
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
server.version=1.13.0
1+
server.version=1.14.0
22

33
server.address=
44
server.port=4000
@@ -15,7 +15,7 @@ files.docservice.history.postfix=-hist
1515
files.docservice.url.example=
1616

1717

18-
files.docservice.languages=en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
18+
files.docservice.languages=en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|ur:Urdu|vi:Vietnamese|aa-AA:Test Language
1919

2020
docservice.url=http://documentserver/
2121
docservice.ignoreSSLCertificate=false

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=1.13.0
1+
version=1.14.0
22

33
filesize-max=5242880
44
storage-folder=app_data
@@ -11,10 +11,10 @@ files.docservice.url.site=http://documentserver/
1111
files.docservice.url.converter=converter
1212
files.docservice.url.command=command
1313
files.docservice.url.api=web-apps/apps/api/documents/api.js
14-
files.docservice.url.preloader=web-apps/apps/api/documents/cache-scripts.html
14+
files.docservice.url.preloader=web-apps/apps/api/documents/preload.html
1515
files.docservice.url.example=
1616

17-
files.docservice.languages=en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
17+
files.docservice.languages=en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|ur:Urdu|vi:Vietnamese|aa-AA:Test Language
1818

1919
files.docservice.secret=
2020
files.docservice.header=Authorization

‎web/documentserver-example/nodejs/app.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1139,6 +1139,7 @@ app.get('/editor', (req, res) => { // define a handler for editing document
11391139
const { reviewGroups } = user;
11401140
const { commentGroups } = user;
11411141
const { userInfoGroups } = user;
1142+
const userRoles = user.roles;
11421143

11431144
const usersInfo = [];
11441145
const usersForProtect = [];
@@ -1180,7 +1181,7 @@ app.get('/editor', (req, res) => { // define a handler for editing document
11801181

11811182
let submitForm = false;
11821183
if (mode !== 'view') {
1183-
submitForm = userid === 'uid-1';
1184+
submitForm = user.canSubmitForm;
11841185
}
11851186

11861187
if (user.goback != null) {
@@ -1226,6 +1227,7 @@ app.get('/editor', (req, res) => { // define a handler for editing document
12261227
userImage: user.avatar ? `${req.DocManager.getServerUrl()}/images/${user.id}.png` : null,
12271228
name,
12281229
userGroup,
1230+
userRoles,
12291231
reviewGroups: JSON.stringify(reviewGroups),
12301232
commentGroups: JSON.stringify(commentGroups),
12311233
userInfoGroups: JSON.stringify(userInfoGroups),

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.13.0",
2+
"version": "1.14.0",
33
"log": {
44
"appenders": [
55
{
@@ -20,7 +20,7 @@
2020
"commandUrl": "command",
2121
"converterUrl": "converter",
2222
"apiUrl": "web-apps/apps/api/documents/api.js",
23-
"preloaderUrl": "web-apps/apps/api/documents/cache-scripts.html",
23+
"preloaderUrl": "web-apps/apps/api/documents/preload.html",
2424
"exampleUrl": null,
2525
"storageFolder": "./files",
2626
"storagePath": "/files",
@@ -83,6 +83,7 @@
8383
"sv": "Swedish",
8484
"tr": "Turkish",
8585
"uk": "Ukrainian",
86+
"ur": "Urdu",
8687
"vi": "Vietnamese",
8788
"aa-AA": "Test Language"
8889
}

‎web/documentserver-example/nodejs/config/development-linux.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"server": {
33
"port": 3000,
4-
"siteUrl": "http://127.0.0.1:8000/",
5-
"apiUrl": "web-apps/apps/api/documents/api.js",
6-
"preloaderUrl": "web-apps/apps/api/documents/cache-scripts.html"
4+
"siteUrl": "http://127.0.0.1:8000/"
75
}
86
}

‎web/documentserver-example/nodejs/config/development-mac.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"server": {
33
"port": 3000,
4-
"siteUrl": "http://127.0.0.1:8000/",
5-
"apiUrl": "web-apps/apps/api/documents/api.js",
6-
"preloaderUrl": "web-apps/apps/api/documents/cache-scripts.html"
4+
"siteUrl": "http://127.0.0.1:8000/"
75
}
86
}

0 commit comments

Comments
 (0)