Skip to content

Commit b363881

Browse files
LinneySLinneyS
authored
Merge pull request #579 from ONLYOFFICE/release/v1.9.0
Release/1.9.0
2 parents 333981c + 052f73e commit b363881

39 files changed

Lines changed: 109 additions & 52 deletions

File tree

‎.gitmodules‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
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
8-
branch = feature/v8.0
98
[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
109
path = web/documentserver-example/csharp-mvc/assets/document-templates
1110
url = https://github.com/ONLYOFFICE/document-templates

‎CHANGELOG.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
# Change Log
22

3+
## 1.9.0
4+
- nodejs: filling by default
5+
- nodejs: docxf, oform as pdf documentType
6+
- nodejs: creating and editing pdf instead docxf
7+
- nodejs: wopi formsubmit icon
8+
- nodejs: close editor
9+
- en-GB, sr-Cyrl-RS skin languages
10+
- switching from filling to editing
11+
- fill permission in embedded mode
12+
313
## 1.8.0
414
- nodejs: pdf, djvu, xps, oxps as pdf documentType
515
- nodejs: filling pdf
616
- version number to page meta
717
- ar skin languages
8-
- sr-Latn-CS skin languages
18+
- sr-Latn-RS skin languages
919
- getting history via api
1020
- using a repo with a list of formats
1121
- convert after uploading only tagged formats

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public string GetDocConfig(HttpRequest request, UrlHelper url)
157157
{ "download", !user.deniedPermissions.Contains("download") },
158158
{ "edit", canEdit && (editorsMode == "edit" || editorsMode == "view" || editorsMode == "filter" || editorsMode == "blockcontent") },
159159
{ "print", !user.deniedPermissions.Contains("print") },
160-
{ "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "embedded" && editorsMode != "blockcontent" },
160+
{ "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "blockcontent" },
161161
{ "modifyFilter", editorsMode != "filter" },
162162
{ "modifyContentControl", editorsMode != "blockcontent" },
163163
{ "review", canEdit && (editorsMode == "edit" || editorsMode == "review") },

‎web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
6969
// the user is trying to switch the document from the viewing into the editing mode
7070
var onRequestEditRights = function () {
71-
location.href = location.href.replace(RegExp("editorsMode=view\&?", "i"), "");
71+
location.href = location.href.replace(RegExp("editorsMode=\\w+\&?", "i"), "") + "&editorsMode=edit";
7272
};
7373
7474
// an error or some other specific event occurs

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

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

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

1616
<add key="files.docservice.verify-peer-off" 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|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-Latn-CS:Serbian|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|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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
8787
// the user is trying to switch the document from the viewing into the editing mode
8888
var onRequestEditRights = function () {
89-
location.href = location.href.replace(RegExp("editorsMode=view\&?", "i"), "");
89+
location.href = location.href.replace(RegExp("editorsMode=\\w+\&?", "i"), "") + "&editorsMode=edit";
9090
};
9191
9292
// an error or some other specific event occurs

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ protected void Page_Load(object sender, EventArgs e)
225225
{ "download", !user.deniedPermissions.Contains("download") },
226226
{ "edit", canEdit && (editorsMode == "edit" || editorsMode =="view" || editorsMode == "filter" || editorsMode == "blockcontent") },
227227
{ "print", !user.deniedPermissions.Contains("print") },
228-
{ "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "embedded" && editorsMode != "blockcontent" },
228+
{ "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "blockcontent" },
229229
{ "modifyFilter", editorsMode != "filter" },
230230
{ "modifyContentControl", editorsMode != "blockcontent" },
231231
{ "review", canEdit && (editorsMode == "edit" || editorsMode == "review") },

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

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

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

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

17-
<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|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-Latn-CS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
17+
<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"/>
1818

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

‎web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultFileConfigurer.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ private Permission updatePermissions(final Permission userPermissions, final Act
120120
userPermissions.setFillForms(
121121
!action.equals(Action.view)
122122
&& !action.equals(Action.comment)
123-
&& !action.equals(Action.embedded)
124123
&& !action.equals(Action.blockcontent)
125124
);
126125

‎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.8.0
1+
server.version=1.9.0
22

33
server.address=
44
server.port=4000
@@ -25,7 +25,7 @@ files.docservice.token-use-for-request=true
2525

2626
files.docservice.verify-peer-off=true
2727

28-
files.docservice.languages=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|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-Latn-CS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
28+
files.docservice.languages=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
2929

3030
spring.datasource.url=jdbc:h2:mem:usersdb
3131
spring.datasource.driverClassName=org.h2.Driver

0 commit comments

Comments
 (0)