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

Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0

Browse Source
This commit is contained in:
Nikita Gopienko 2021-10-14 11:56:09 +03:00
commit 3603b9d899
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/nginx/onlyoffice.conf
View File

@ -23,8 +23,9 @@ map $request_uri $header_x_frame_options {
}
map $request_uri $cache_control {
default "";
~*^/(api\/2\.0.*|storage|login\.ashx|products\/.+\/httphandlers\/filehandler\.ashx|ChunkedUploader.ashx|apisystem|sh) "no-cache, no-store, must-revalidate";
default "no-cache, no-store, must-revalidate";
# ~*^/(api\/2\.0.*|storage|login\.ashx|products\/.+\/httphandlers\/filehandler\.ashx|ChunkedUploader.ashx|apisystem|sh) "no-cache, no-store, must-revalidate";
~*\.(ogg|ogv|svg|svgz|eot|otf|woff|mp4|ttf|rss|atom|jpg|jpeg|gif|png|ico|zip|tgz|gz|rar|bz2|doc|xls|exe|ppt|tar|mid|midi|wav|bmp|rtf|md|css|js)$ "public, no-transform";
}
include /etc/nginx/includes/onlyoffice-*.conf;
@ -145,7 +146,6 @@ server {
}
location /api/2.0 {
add_header Cache-Control $cache_control;
location ~* /(files|encryption|privacyroom) {
proxy_pass http://localhost:5007;
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;

2
products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
View File

@ -64,7 +64,7 @@ const StyledTileContainer = styled.div`
@media (min-width: 1024px) {
.tile-item-wrapper {
&.file {
margin-left: 2px;
margin-left: 1px;
}
}
}