Skip to content

Commit 78fe9e0

Browse files
LinneySLinneyS
committed
Merge pull request 'release/v1.11.0' from release/v1.11.0 into master
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/16
2 parents d68860f + 8e260de commit 78fe9e0

37 files changed

Lines changed: 87 additions & 82 deletions

‎.gitmodules‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
[submodule "web/documentserver-example/nodejs/public/assets/document-templates"]
22
path = web/documentserver-example/nodejs/public/assets/document-templates
33
url = https://github.com/ONLYOFFICE/document-templates
4-
branch = main/en
4+
branch = main/default
55
[submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
66
path = web/documentserver-example/nodejs/public/assets/document-formats
77
url = https://github.com/ONLYOFFICE/document-formats
88
[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
99
path = web/documentserver-example/csharp-mvc/assets/document-templates
1010
url = https://github.com/ONLYOFFICE/document-templates
11-
branch = main/en
11+
branch = main/default
1212
[submodule "web/documentserver-example/csharp-mvc/assets/document-formats"]
1313
path = web/documentserver-example/csharp-mvc/assets/document-formats
1414
url = https://github.com/ONLYOFFICE/document-formats
1515
[submodule "web/documentserver-example/php/assets/document-templates"]
1616
path = web/documentserver-example/php/assets/document-templates
1717
url = https://github.com/ONLYOFFICE/document-templates
18-
branch = main/en
18+
branch = main/default
1919
[submodule "web/documentserver-example/php/assets/document-formats"]
2020
path = web/documentserver-example/php/assets/document-formats
2121
url = https://github.com/ONLYOFFICE/document-formats
2222
branch = master
2323
[submodule "web/documentserver-example/python/assets/document-templates"]
2424
path = web/documentserver-example/python/assets/document-templates
2525
url = https://github.com/ONLYOFFICE/document-templates
26-
branch = main/en
26+
branch = main/default
2727
[submodule "web/documentserver-example/java/src/main/resources/assets/document-templates"]
2828
path = web/documentserver-example/java/src/main/resources/assets/document-templates
2929
url = https://github.com/ONLYOFFICE/document-templates
30-
branch = main/en
30+
branch = main/default
3131
[submodule "web/documentserver-example/ruby/assets/document-templates"]
3232
path = web/documentserver-example/ruby/assets/document-templates
3333
url = https://github.com/ONLYOFFICE/document-templates
34-
branch = main/en
34+
branch = main/default
3535
[submodule "web/documentserver-example/java-spring/src/main/resources/assets/document-templates"]
3636
path = web/documentserver-example/java-spring/src/main/resources/assets/document-templates
3737
url = https://github.com/ONLYOFFICE/document-templates
38-
branch = main/en
38+
branch = main/default
3939
[submodule "web/documentserver-example/python/assets/document-formats"]
4040
path = web/documentserver-example/python/assets/document-formats
4141
url = https://github.com/ONLYOFFICE/document-formats
@@ -51,7 +51,7 @@
5151
[submodule "web/documentserver-example/csharp/assets/document-templates"]
5252
path = web/documentserver-example/csharp/assets/document-templates
5353
url = https://github.com/ONLYOFFICE/document-templates
54-
branch = main/en
54+
branch = main/default
5555
[submodule "web/documentserver-example/csharp/assets/document-formats"]
5656
path = web/documentserver-example/csharp/assets/document-formats
5757
url = https://github.com/ONLYOFFICE/document-formats

‎CHANGELOG.md‎

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

3+
## 1.11.0
4+
- he-IL skin language
5+
- ConvertService.ashx address replaced with converter
6+
- coauthoring/CommandService.ashx address replaced with command
7+
- without submitForm in viewer
8+
39
## 1.10.0
410
- nodejs: converting function on index page
511
- java-spring: using java docs-integration-sdk

‎web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ private static int GetResponseData(string jsonDocumentResponse, out Dictionary<s
225225
private static void ProcessResponseError(int errorCode)
226226
{
227227
var errorMessage = string.Empty;
228-
const string errorMessageTemplate = "Error occurred in the ConvertService.ashx: {0}";
228+
const string errorMessageTemplate = "Error occurred in the ConvertService: {0}";
229229

230230
switch (errorCode)
231231
{

‎web/documentserver-example/csharp-mvc/Models/FileModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public string GetDocConfig(HttpRequest request, UrlHelper url)
8989
editorsMode = "fillForms";
9090
canEdit = true;
9191
}
92-
var submitForm = (editorsMode.Equals("fillForms") || editorsMode.Equals("embedded")) && user.id.Equals("uid-1"); // check if the Submit form button is displayed or not
92+
var submitForm = !editorsMode.Equals("view") && user.id.Equals("uid-1"); // check if the Submit form button is displayed or not
9393
var mode = canEdit && editorsMode != "view" ? "edit" : "view"; // set the mode parameter: change it to view if the document can't be edited
9494

9595
// favorite icon state

‎web/documentserver-example/csharp-mvc/assets/document-templates‎

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

Lines changed: 4 additions & 4 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.10.0"/>
4+
<add key="version" value="1.11.0"/>
55

66
<add key="filesize-max" value="52428800"/>
77
<add key="storage-path" value=""/>
@@ -16,14 +16,14 @@
1616

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

19-
<add key="files.docservice.languages" value="en:English|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|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|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"/>
2020

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

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

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

‎web/documentserver-example/csharp/DocEditor.aspx.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ protected void Page_Load(object sender, EventArgs e)
154154
editorsMode = "fillForms";
155155
canEdit = true;
156156
}
157-
var submitForm = (editorsMode.Equals("fillForms") || editorsMode.Equals("embedded")) && user.id.Equals("uid-1"); // check if the Submit form button is displayed or hidden
157+
var submitForm = !editorsMode.Equals("view") && user.id.Equals("uid-1"); // check if the Submit form button is displayed or hidden
158158
var mode = canEdit && editorsMode != "view" ? "edit" : "view"; // get the editor opening mode (edit or view)
159159

160160
var jss = new JavaScriptSerializer();

‎web/documentserver-example/csharp/DocumentConverter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ private static int GetResponseData(string jsonDocumentResponse, out Dictionary<s
227227
private static void ProcessResponseError(int errorCode)
228228
{
229229
var errorMessage = string.Empty;
230-
const string errorMessageTemplate = "Error occurred in the ConvertService.ashx: {0}";
230+
const string errorMessageTemplate = "Error occurred in the ConvertService: {0}";
231231

232232
switch (errorCode)
233233
{

‎web/documentserver-example/csharp/assets/document-templates‎

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

Lines changed: 4 additions & 4 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.10.0"/>
4+
<add key="version" value="1.11.0"/>
55

66
<add key="filesize-max" value="52428800"/>
77
<add key="storage-path" value=""/>
@@ -15,14 +15,14 @@
1515

1616
<add key="files.docservice.token.useforrequest" value="true" />
1717

18-
<add key="files.docservice.languages" value="en:English|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|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+
<add key="files.docservice.languages" value="en:English|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"/>
1919

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

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

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

0 commit comments

Comments
 (0)