Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch release/v6.3.0 into master #259

Merged
merged 40 commits into from
May 20, 2021
Merged

Merge branch release/v6.3.0 into master #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
997165a
Merge remote-tracking branch 'remotes/origin/release/v6.1.0' into dev…
konovalovsergey Dec 7, 2020
7bf5663
[license] For 997165a4aff1a22aae3778b4eecce9a717dec641
konovalovsergey Dec 7, 2020
b836348
Merge branch hotfix/v6.0.2 into develop
papacarlo Dec 7, 2020
2fa6402
[sql] Add password column
konovalovsergey Nov 30, 2020
2b5aa74
[feature] Add savepassword param to file assembly
konovalovsergey Dec 2, 2020
ac67ba1
[feature] Add setpassword command
konovalovsergey Dec 3, 2020
953b60d
[feature] Fix version history with password
konovalovsergey Dec 4, 2020
8904a33
[sql] Add creation_date, additional_params columns
konovalovsergey Dec 7, 2020
7639729
[feature] Add upgrade scripts; Remove additional_params column
konovalovsergey Dec 9, 2020
ce89110
[config] Add openpgpjs object; For bug 47181
konovalovsergey Dec 10, 2020
c3553e6
Feature/change name (#234)
konovalovsergey Dec 16, 2020
dd219bf
[feature] Fix changeConnectionInfo to send c_oPublishType.participant…
konovalovsergey Dec 18, 2020
0b364f9
[spellchecker] Update
trofim24 Dec 21, 2020
3ffefed
Merge pull request #236 from ONLYOFFICE/update/spellchecker
trofim24 Dec 21, 2020
77ac3ae
Merge branch release/v6.1.0 into develop
papacarlo Dec 24, 2020
a44a1af
[feature] Send openProtectedFile config param to browser
konovalovsergey Jan 20, 2021
b7083ae
[feature] Publish changedocinfo command to all connections with equal…
konovalovsergey Jan 20, 2021
f1e2a29
Merge branch hotfix/v6.1.1 into develop
papacarlo Jan 28, 2021
ae7dab8
[bug] Fix issue with set->remove password
konovalovsergey Feb 1, 2021
e7c5bce
[feature] Send Forms
konovalovsergey Feb 9, 2021
74b77d1
[bug] Consider empty string as an anonymous name
konovalovsergey Feb 9, 2021
5cfc43c
[config] Add connectionAndInactivity to callbackRequestTimeout
konovalovsergey Feb 12, 2021
dcb79e6
[bug] Fix bug with error message when opening document if task is in …
konovalovsergey Feb 17, 2021
bd1c5ca
[feature] Convert idOriginal to String
konovalovsergey Feb 19, 2021
7440f4e
Fix homepage url
trofim24 Feb 25, 2021
594495d
[npm] npm audit fix; express version up for wasm mimetype
konovalovsergey Feb 26, 2021
2779c7b
[config] Remove spellcheckerUrl; Add dictionaries to static_content
konovalovsergey Mar 1, 2021
7d17965
Merge remote-tracking branch 'origin/master' into release/v6.3.0
trofim24 Mar 4, 2021
aef6f35
[bug] Fix bug with anonymous; for 74b77d1e9c87b31ffc1afdf27d3ee13c94d…
konovalovsergey Mar 11, 2021
12e4056
[bug] Fix changedocinfo command in mode without token. (#244)
konovalovsergey Mar 15, 2021
06134b3
[bug] Fix bug 49147 (#245)
konovalovsergey Mar 18, 2021
c7e7818
[feature] Add m_sTitle param to converter
konovalovsergey Apr 2, 2021
caebdd6
[bug] For bug 49002
konovalovsergey Apr 2, 2021
9cb1188
Add docbuilderCoreFontsPath parameter definition to production (#250)
romandemidov Apr 7, 2021
98ae4f7
[bug] For bug 49716
konovalovsergey Apr 27, 2021
ed42574
[bug] Fix bug 49946
konovalovsergey Apr 30, 2021
e1a309a
[bug] Fix bug 49714
konovalovsergey May 4, 2021
6c78acf
[bug] For 57657dcaad6b0b60ffb051fe9e047e3adea670c0 (concat null in po…
konovalovsergey May 4, 2021
6b83207
Merge remote-tracking branch 'remotes/origin/hotfix/v6.2.2' into rele…
konovalovsergey May 11, 2021
b3a1dc7
[bug] Move from cron to setTimeout to avoid "uncaughtException: Somet…
konovalovsergey May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion Common/config/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,16 @@
"ttl" : 300,
"cachesize" : 1000
},
"openpgpjs": {
"config": {
},
"encrypt": {
"passwords": ["verysecretstring"]
},
"decrypt": {
"passwords": ["verysecretstring"]
}
},
"services": {
"CoAuthoring": {
"server": {
Expand All @@ -77,6 +87,7 @@
"wholeCycle": "2m"
},
"callbackRequestTimeout": {
"connectionAndInactivity": "10s",
"wholeCycle": "2m"
},
"healthcheckfilepath": "../public/healthcheck.docx",
Expand Down Expand Up @@ -204,7 +215,7 @@
"autostart": []
},
"editor":{
"spellcheckerUrl": "/spellchecker",
"spellcheckerUrl": "",
"reconnection":{
"attempts": 50,
"delay": "2s"
Expand Down Expand Up @@ -247,6 +258,7 @@
"x2tPath": "null",
"docbuilderPath": "null",
"docbuilderAllFontsPath": "null",
"docbuilderCoreFontsPath": "",
"args": "",
"spawnOptions": {},
"errorfiles": "",
Expand Down
6 changes: 5 additions & 1 deletion Common/config/development-linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
"/sdkjs-plugins": {
"path": "../../../sdkjs-plugins"
},
"/dictionaries": {
"path": "../../../dictionaries"
},
"/info": {
"path": "../branding/info"
}
Expand Down Expand Up @@ -52,7 +55,8 @@
"presentationThemesDir": "../../../sdkjs/slide/themes",
"x2tPath": "../../FileConverter/bin/x2t",
"docbuilderPath": "../../FileConverter/bin/docbuilder",
"docbuilderAllFontsPath": "../../App_Data/docbuilder/AllFonts.js"
"docbuilderAllFontsPath": "../../App_Data/docbuilder/AllFonts.js",
"docbuilderCoreFontsPath": "../../../core-fonts"
}
},
"SpellChecker": {
Expand Down
7 changes: 4 additions & 3 deletions Common/config/development-mac.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
"/sdkjs-plugins": {
"path": "../../../sdkjs-plugins"
},
"/dictionaries": {
"path": "../../../dictionaries"
},
"/info": {
"path": "../../branding/info"
}
Expand All @@ -42,9 +45,6 @@
"allowPrivateIPAddress": true,
"allowMetaIPAddress": true
},
"editor": {
"spellcheckerUrl": "http://127.0.0.1:8080"
},
"sockjs": {
"sockjs_url": "/office/vendor/sockjs/sockjs.min.js"
}
Expand All @@ -62,6 +62,7 @@
"x2tPath": "../../FileConverter/bin/x2t",
"docbuilderPath": "../../FileConverter/Bin/docbuilder",
"docbuilderAllFontsPath": "../../App_Data/docbuilder/AllFonts.js",
"docbuilderCoreFontsPath": "../../../core-fonts",
"errorfiles": "error"
}
},
Expand Down
7 changes: 4 additions & 3 deletions Common/config/development-windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
"/sdkjs-plugins": {
"path": "../../../sdkjs-plugins"
},
"/dictionaries": {
"path": "../../../dictionaries"
},
"/info": {
"path": "../../branding/info"
}
Expand All @@ -42,9 +45,6 @@
"allowPrivateIPAddress": true,
"allowMetaIPAddress": true
},
"editor": {
"spellcheckerUrl": "http://127.0.0.1:8080"
},
"sockjs": {
"sockjs_url": "/web-apps/vendor/sockjs/sockjs.min.js"
}
Expand All @@ -62,6 +62,7 @@
"x2tPath": "../../FileConverter/Bin/x2t.exe",
"docbuilderPath": "../../FileConverter/Bin/docbuilder.exe",
"docbuilderAllFontsPath": "../../App_Data/docbuilder/AllFonts.js",
"docbuilderCoreFontsPath": "../../../core-fonts",
"errorfiles": "error"
}
},
Expand Down
7 changes: 6 additions & 1 deletion Common/config/production-linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
"/sdkjs-plugins": {
"path": "/var/www/onlyoffice/documentserver/sdkjs-plugins",
"options": {"maxAge": "7d"}
},
"/dictionaries": {
"path": "/var/www/onlyoffice/documentserver/server/SpellChecker/dictionaries",
"options": {"maxAge": "7d"}
}
}
},
Expand All @@ -56,7 +60,8 @@
"presentationThemesDir": "/var/www/onlyoffice/documentserver/sdkjs/slide/themes",
"x2tPath": "/var/www/onlyoffice/documentserver/server/FileConverter/bin/x2t",
"docbuilderPath": "/var/www/onlyoffice/documentserver/server/FileConverter/bin/docbuilder",
"docbuilderAllFontsPath": "/var/lib/onlyoffice/documentserver/App_Data/docbuilder/AllFonts.js"
"docbuilderAllFontsPath": "/var/lib/onlyoffice/documentserver/App_Data/docbuilder/AllFonts.js",
"docbuilderCoreFontsPath": "/var/www/onlyoffice/documentserver/core-fonts"
}
},
"FileStorage": {
Expand Down
7 changes: 6 additions & 1 deletion Common/config/production-windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
"path": "../../sdkjs-plugins",
"options": {"maxAge": "7d"}
},
"/dictionaries": {
"path": "../SpellChecker/dictionaries",
"options": {"maxAge": "7d"}
},
"/welcome": {
"path": "../welcome",
"options": {"maxAge": "7d"}
Expand Down Expand Up @@ -56,7 +60,8 @@
"presentationThemesDir": "../../sdkjs/slide/themes",
"x2tPath": "../FileConverter/bin/x2t.exe",
"docbuilderPath": "../FileConverter/bin/docbuilder.exe",
"docbuilderAllFontsPath": "../App_Data/docbuilder/AllFonts.js"
"docbuilderAllFontsPath": "../App_Data/docbuilder/AllFonts.js",
"docbuilderCoreFontsPath": "../../core-fonts"
}
},
"SpellChecker": {
Expand Down
Loading