Merge branch 'hotfix/v2.6.1' into develop
This commit is contained in:
commit
0c1aba2f03
@ -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}",
|
||||
|
@ -66,33 +66,6 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"services": [
|
||||
{
|
||||
|
@ -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";
|
||||
}
|
||||
|
@ -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
|
Loading…
Reference in New Issue
Block a user