Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
yflory 4 years ago
commit c011b3045c

@ -9,6 +9,7 @@
* don't create readmes * don't create readmes
* support displaying a roadmap in static pages' footer * support displaying a roadmap in static pages' footer
* adjust threshold for whiteboard file size limit to better match user expectation (file size instead of base64 size) * adjust threshold for whiteboard file size limit to better match user expectation (file size instead of base64 size)
* FLOC OFF GOOGLE header
# 4.4.0 # 4.4.0

@ -60,6 +60,9 @@ server {
add_header Access-Control-Allow-Origin "*"; add_header Access-Control-Allow-Origin "*";
# add_header X-Frame-Options "SAMEORIGIN"; # add_header X-Frame-Options "SAMEORIGIN";
# Opt out of Google's FLoC Network
add_header Permissions-Policy interest-cohort=();
set $coop ''; set $coop '';
if ($uri ~ ^\/(sheet|presentation|doc)\/.*$) { set $coop 'same-origin'; } if ($uri ~ ^\/(sheet|presentation|doc)\/.*$) { set $coop 'same-origin'; }

Loading…
Cancel
Save