6.3.1.32

Dockerfile

@@ -1,5 +1,5 @@
-ARG product_version=6.3.0
+ARG product_version=6.3.1
-ARG build_number=111
+ARG build_number=32
 ARG oo_root='/var/www/onlyoffice/documentserver'
 
 

server.patch

@@ -1,4 +1,4 @@
-From 10a7f4497de9e21b5e7708fff75ce15398955d6c Mon Sep 17 00:00:00 2001
+From 03a3990e83a94666abb5a27447fa1b67076b0e08 Mon Sep 17 00:00:00 2001
 From: Alexander Hofbauer <alex@derhofbauer.at>
 Date: Fri, 21 May 2021 10:35:05 +0200
 Subject: [PATCH] Patch for license
@@ -7,14 +7,14 @@ Subject: [PATCH] Patch for license
  Common/sources/commondefines.js          |  4 ++--
  Common/sources/constants.js              |  2 +-
  Common/sources/license.js                | 16 ++++++++--------
- DocService/sources/DocsCoServer.js       |  5 +++--
+ DocService/sources/DocsCoServer.js       |  4 ++--
  DocService/sources/server.js             |  1 -
  FileConverter/sources/convertermaster.js |  1 -
  Makefile                                 |  2 +-
- 7 files changed, 15 insertions(+), 16 deletions(-)
+ 7 files changed, 14 insertions(+), 16 deletions(-)
 
 diff --git a/Common/sources/commondefines.js b/Common/sources/commondefines.js
-index ec6a870..e20d966 100644
+index ec6a870..d1f21c2 100644
 --- a/Common/sources/commondefines.js
 +++ b/Common/sources/commondefines.js
 @@ -1035,8 +1035,8 @@ const c_oAscUnlockRes = {
@@ -23,8 +23,8 @@ index ec6a870..e20d966 100644
  
 -const buildVersion = '4.1.2';
 -const buildNumber = 37;
-+const buildVersion = '6.3.0';
++const buildVersion = '6.3.1';
-+const buildNumber = 111;
++const buildNumber = 32;
  
  exports.TaskQueueData = TaskQueueData;
  exports.CMailMergeSendData = CMailMergeSendData;
@@ -42,7 +42,7 @@ index f976ed9..e5b91fd 100644
  
  exports.AVS_OFFICESTUDIO_FILE_UNKNOWN =  0x0000;
 diff --git a/Common/sources/license.js b/Common/sources/license.js
-index 19f0b61..7aa1d44 100644
+index ea257bd..5aefbf1 100644
 --- a/Common/sources/license.js
 +++ b/Common/sources/license.js
 @@ -34,7 +34,7 @@
@@ -50,11 +50,11 @@ index 19f0b61..7aa1d44 100644
  const constants = require('./constants');
  
 -const buildDate = '6/29/2016';
-+const buildDate = '2021-05-20T16:02:00.000Z';
++const buildDate = '2021-06-06T14:34:00.000Z';
  const oBuildDate = new Date(buildDate);
  
  exports.readLicense = function*() {
-@@ -43,17 +43,17 @@ exports.readLicense = function*() {
+@@ -43,18 +43,18 @@ exports.readLicense = function*() {
  		count: 1,
  		type: c_LR.Success,
  		light: false,
@@ -77,21 +77,14 @@ index 19f0b61..7aa1d44 100644
 +		endDate: "2099-01-01T23:59:59.000Z"
  	};
  };
+ 
 -exports.packageType = constants.PACKAGE_TYPE_OS;
 +exports.packageType = constants.PACKAGE_TYPE_I;
 diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
-index 688f3c7..0b67274 100644
+index 0365510..ee25b0c 100644
 --- a/DocService/sources/DocsCoServer.js
 +++ b/DocService/sources/DocsCoServer.js
-@@ -102,6 +102,7 @@ const pubsubService = require('./pubsubRabbitMQ');
+@@ -163,7 +163,7 @@ let connections = []; // Активные соединения
- const queueService = require('./../../Common/sources/taskqueueRabbitMQ');
- const rabbitMQCore = require('./../../Common/sources/rabbitMQCore');
- const activeMQCore = require('./../../Common/sources/activeMQCore');
-+const license = require('./../../Common/sources/license');
- 
- const editorDataStorage = require('./' + configCommon.get('services.CoAuthoring.server.editorDataStorage'));
- let cfgEditor = JSON.parse(JSON.stringify(config.get('editor')));
-@@ -162,7 +163,7 @@ let connections = []; // Активные соединения
  let lockDocumentsTimerId = {};//to drop connection that can't unlockDocument
  let pubsub;
  let queue;
@@ -100,7 +93,7 @@ index 688f3c7..0b67274 100644
  let shutdownFlag = false;
  let expDocumentsStep = gc.getCronStep(cfgExpDocumentsCron);
  
-@@ -3093,7 +3094,7 @@ exports.install = function(server, callbackFunction) {
+@@ -3094,7 +3094,7 @@ exports.install = function(server, callbackFunction) {
    });
  };
  exports.setLicenseInfo = function(data) {

web-apps.patch

@@ -1,4 +1,4 @@
-From bb34f1d724580a43fb93d70cb85eaf7a3cfd3a84 Mon Sep 17 00:00:00 2001
+From 45f206f4f02c1427cceabc7e7d48d9873eda5afa Mon Sep 17 00:00:00 2001
 From: Alexander Hofbauer <a.hofbauer@fify.at>
 Date: Fri, 21 May 2021 10:35:21 +0200
 Subject: [PATCH] Revert "disable mobile editing"
@@ -46,7 +46,7 @@ partially brings back mobile editing, especially via:
  30 files changed, 786 insertions(+), 29 deletions(-)
 
 diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js
-index 66f8d59fc..cf6a62712 100644
+index b53ab6578..661444a9c 100644
 --- a/apps/documenteditor/mobile/app/controller/Main.js
 +++ b/apps/documenteditor/mobile/app/controller/Main.js
 @@ -289,7 +289,7 @@ define([
@@ -84,8 +84,8 @@ index 66f8d59fc..cf6a62712 100644
              },
  
              onRunAutostartMacroses: function() {
-@@ -1646,4 +1647,4 @@ define([
+@@ -1658,4 +1659,4 @@ define([
-             txtCurrentDocument: "Current Document"
+             errorLang: 'The interface language is not loaded.<br>Please contact your Document Server administrator.'
          }
      })(), DE.Controllers.Main || {}))
 -});
@@ -579,7 +579,7 @@ index 08f0ba0af..5126050f1 100644
 \ No newline at end of file
 +});
 diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js
-index 4c9c14894..13ee3da65 100644
+index 012b4ce3d..c36e6396a 100644
 --- a/apps/presentationeditor/mobile/app/controller/Main.js
 +++ b/apps/presentationeditor/mobile/app/controller/Main.js
 @@ -1190,6 +1190,7 @@ define([
@@ -599,8 +599,8 @@ index 4c9c14894..13ee3da65 100644
              },
  
              onRunAutostartMacroses: function() {
-@@ -1576,4 +1577,4 @@ define([
+@@ -1588,4 +1589,4 @@ define([
-             txtAddFirstSlide: 'Click to add first slide'
+             errorLang: 'The interface language is not loaded.<br>Please contact your Document Server administrator.'
          }
      })(), PE.Controllers.Main || {}))
 -});
@@ -1133,7 +1133,7 @@ index 116758067..e40fde1ac 100644
 \ No newline at end of file
 +});
 diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js
-index 07f75cbf8..877229873 100644
+index 71f96d868..883eca8cd 100644
 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js
 +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js
 @@ -1332,6 +1332,7 @@ define([
@@ -1153,8 +1153,8 @@ index 07f75cbf8..877229873 100644
              },
  
              onRunAutostartMacroses: function() {
-@@ -1798,4 +1799,4 @@ define([
+@@ -1810,4 +1811,4 @@ define([
-             errorLockedCellPivot: 'You cannot change data inside a pivot table.'
+             errorLang: 'The interface language is not loaded.<br>Please contact your Document Server administrator.'
          }
      })(), SSE.Controllers.Main || {}))
 -});