diff --git a/.gitignore b/.gitignore index 14fd5e518..b78534633 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ www/common/onlyoffice/v* /www/common/onlyoffice/dist/ /onlyoffice-conf/ +/onlyoffice-dist/ diff --git a/docker-compose.yml b/docker-compose.yml index 186a61729..a324a89da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,8 +15,11 @@ services: - CPAD_SANDBOX_DOMAIN=https://your-sandbox-domain.com - CPAD_CONF=/cryptpad/config/config.js - # Uncomment the next line, when you want to use OnlyOffice on - # your installation. TODO add link to license + # Uncomment the next line, if you want to use OnlyOffice on + # your installation. + # + # Read and accept this before doing this: + # https://github.com/ONLYOFFICE/web-apps/blob/master/LICENSE.txt # - CPAD_INSTALL_ONLYOFFICE=yes volumes: diff --git a/install-onlyoffice.sh b/install-onlyoffice.sh index fa0f59188..2c14bd6bd 100755 --- a/install-onlyoffice.sh +++ b/install-onlyoffice.sh @@ -110,7 +110,7 @@ ensure_oo_is_downloaded () { ensure_command_available git if ! [ -d "$BUILDS_DIR" ]; then - echo Downloading OnlyOffice... + echo "Downloading OnlyOffice..." git clone --bare https://github.com/cryptpad/onlyoffice-builds.git "$BUILDS_DIR" fi } @@ -134,9 +134,9 @@ install_version () { echo "$COMMIT" > "$FULL_DIR"/.commit - echo "$DIR" updated + echo "$DIR updated" else - echo "$DIR" was up to date + echo "$DIR was up to date" fi @@ -147,7 +147,7 @@ install_version () { ensure_command_available () { if ! command -v "$1" &> /dev/null; then - echo "$1" needs to be installed to run this script + echo "$1 needs to be installed to run this script" exit 1 fi } diff --git a/www/checkup/main.js b/www/checkup/main.js index 923e3119e..0a95ec9d3 100644 --- a/www/checkup/main.js +++ b/www/checkup/main.js @@ -421,7 +421,7 @@ define([ }); }); - var sheetURL = '/common/onlyoffice/dist/v5/web-apps/apps/spreadsheeteditor/main/index.html'; + var sheetURL = '/common/onlyoffice/dist/v7/web-apps/apps/spreadsheeteditor/main/index.html'; assert(function (cb, msg) { msg.innerText = "Missing HTTP headers required for .xlsx export from sheets. "; @@ -718,7 +718,7 @@ define([ }); assert(function (cb, msg) { // FIXME possibly superseded by more advanced CSP tests? - var url = '/common/onlyoffice/dist/v5/web-apps/apps/spreadsheeteditor/main/index.html'; + var url = '/common/onlyoffice/dist/v7/web-apps/apps/spreadsheeteditor/main/index.html'; msg.appendChild(CSP_WARNING(url)); deferredPostMessage({ command: 'GET_HEADER',