From f78cf9366c25836533d932bd60a55ceb6c7e98f1 Mon Sep 17 00:00:00 2001 From: Alexander Hofbauer Date: Tue, 23 Feb 2021 21:34:42 +0100 Subject: [PATCH] 6.1.1.53 --- Dockerfile | 4 ++-- license.patch | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1c524a1..e807761 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ## Build stage -ARG product_version=6.1.0 -ARG build_number=83 +ARG product_version=6.1.1 +ARG build_number=53 ARG oo_root='/var/www/onlyoffice/documentserver' FROM onlyoffice/documentserver:${product_version}.${build_number} as build-stage diff --git a/license.patch b/license.patch index d29c69f..661ac17 100644 --- a/license.patch +++ b/license.patch @@ -1,4 +1,4 @@ -From cf7351495fd7cdb2ede5bfe4972adc1f0aa1465e Mon Sep 17 00:00:00 2001 +From 34c308280edbb3011ce64e727f8cb522c5fd5ed7 Mon Sep 17 00:00:00 2001 From: Alexander Hofbauer Date: Sun, 27 Dec 2020 21:49:37 +0100 Subject: [PATCH] Patch for license @@ -14,7 +14,7 @@ Subject: [PATCH] Patch for license 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Common/sources/commondefines.js b/Common/sources/commondefines.js -index 694a13a..b2b2e9b 100644 +index 694a13a..8d6d795 100644 --- a/Common/sources/commondefines.js +++ b/Common/sources/commondefines.js @@ -975,8 +975,8 @@ const c_oAscUnlockRes = { @@ -23,8 +23,8 @@ index 694a13a..b2b2e9b 100644 -const buildVersion = '4.1.2'; -const buildNumber = 37; -+const buildVersion = '6.1.0'; -+const buildNumber = 83; ++const buildVersion = '6.1.1'; ++const buildNumber = 53; exports.TaskQueueData = TaskQueueData; exports.CMailMergeSendData = CMailMergeSendData; @@ -42,7 +42,7 @@ index 2b79e02..738df37 100644 exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000; diff --git a/Common/sources/license.js b/Common/sources/license.js -index 19f0b61..30c31c4 100644 +index 19f0b61..9076c94 100644 --- a/Common/sources/license.js +++ b/Common/sources/license.js @@ -34,7 +34,7 @@ @@ -50,7 +50,7 @@ index 19f0b61..30c31c4 100644 const constants = require('./constants'); -const buildDate = '6/29/2016'; -+const buildDate = '2021-01-28T11:37:00.000Z'; ++const buildDate = '2021-01-29T10:10:00.000Z'; const oBuildDate = new Date(buildDate); exports.readLicense = function*() {