IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/v2.6.1' into develop

Browse Source
This commit is contained in:
Alexey Safronov 2024-08-29 13:30:27 +04:00
commit 0c1aba2f03
4 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/appsettings.json
View File

@ -139,7 +139,7 @@
"url": ""
},
"legalterms": "https://help.onlyoffice.co/products/files/doceditor.aspx?fileid=5048502&doc=SXhWMEVzSEYxNlVVaXJJeUVtS0kyYk14YWdXTEFUQmRWL250NllHNUFGbz0_IjUwNDg1MDIi0",
"license-url": "",
"license-url": "https://www.gnu.org/licenses/agpl-3.0.en.html",
"support-feedback": "https://helpdesk.onlyoffice.com",
"teamlab-site": "http://www.onlyoffice.com",
"help-center": "https://helpcenter.onlyoffice.com/{ru|de|fr|es|it}",

27
config/autofac.consumers.json
View File

@ -64,33 +64,6 @@
"boxRedirectUrl" : "https://service.teamlab.info/oauth2.aspx"
}
}
},
{
"type": "ASC.Web.Core.Sms.ClickatellProvider, ASC.Web.Core",
"services": [
{
"type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common"
},
{
"type": "ASC.Web.Core.Sms.ClickatellProvider, ASC.Web.Core"
},
{
"key": "clickatell",
"type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common"
},
{
"key": "clickatell",
"type": "ASC.Web.Core.Sms.ClickatellProvider, ASC.Web.Core"
}
],
"instanceScope": "perlifetimescope",
"parameters": {
"name": "clickatell",
"order": "10",
"props": {
"clickatellapiKey": ""
}
}
},
{
"type": "ASC.FederatedLogin.LoginProviders.DropboxLoginProvider, ASC.FederatedLogin",

2
config/nginx/onlyoffice.conf
View File

@ -44,7 +44,7 @@ map $request_uri $header_x_frame_options {
map $request_uri $cache_control {
default "no-cache, no-store, no-transform";
~*\/(filehandler\.ashx\?action=(thumb|preview))|\/(storage\/room_logos\/root\/.*\?hash.*|storage\/userPhotos\/root\/.*\?hash.*|storage\/whitelabel\/root\/.*\?hash.*|storage\/static_partnerdata\/root\/.*\?hash.*) "must-revalidate, no-transform, immutable, max-age=31536000";
~*\/(filehandler\.ashx\?action=(thumb|preview))|\/(storage\/room_logos\/root\/.*\?hash.*|storage\/userPhotos\/root\/.*\?hash.*|storage\/whitelabel\/root\/.*\?hash.*|storage\/static_partnerdata\/root\/.*\?hash.*) "must-revalidate, no-transform, immutable, max-age=31536000, private";
~*\/(api\/2\.0.*|storage|login\.ashx|filehandler\.ashx|ChunkedUploader.ashx|ThirdPartyAppHandler|apisystem|sh|remoteEntry\.js|debuginfo\.md|static\/scripts\/api\.js|static\/scripts\/sdk\/.*|static\/scripts\/api\.poly\.js) "no-cache, no-store, no-transform";
~*\/(static\/images\/.*)|\/(_next\/public\/images\/.*)|\.(js|woff|woff2|css)|(locales.*\.json) "must-revalidate, no-transform, immutable, max-age=31536000";
}

2
runMigrations.standalone.bat
View File

@ -5,6 +5,6 @@ cd /D "%~dp0"
call start\stop.bat nopause
dotnet build ..\server\asc.web.slnf
dotnet build ..\server\ASC.Migrations.sln
PUSHD %~dp0..\server\common\Tools\ASC.Migration.Runner\bin\Debug\net7.0
PUSHD %~dp0..\server\common\Tools\ASC.Migration.Runner\bin\Debug\
dotnet ASC.Migration.Runner.dll standalone=true
pause