Upgrade to 8.2.0-143 #3

Merged
ayakael merged 4 commits from upgrade-8.2.0 into main 2024-10-18 04:25:09 +00:00
Showing only changes of commit 78f2d77b5b - Show all commits

View file

@ -90,9 +90,9 @@ index ec7b37a2c..bfd879583 100644
+EditorUIController.isSupportEditFeature = () => true;
export default EditorUIController;
diff --git a/server/Common/sources/constants.js.orig b/server/Common/sources/constants.js
diff --git a/server/Common/sources/constants.js b/server/Common/sources/constants.js
index 700696ff..d8bb9178 100644
--- a/server/Common/sources/constants.js.orig
--- a/server/Common/sources/constants.js
+++ b/server/Common/sources/constants.js
@@ -87,8 +87,8 @@ exports.LICENSE_RESULT = {
NotBefore: 16
@ -105,9 +105,9 @@ index 700696ff..d8bb9178 100644
exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000;
diff --git a/server/FileConverter/sources/convertermaster.js.orig b/server/FileConverter/sources/convertermaster.js
diff --git a/server/FileConverter/sources/convertermaster.js b/server/FileConverter/sources/convertermaster.js
index 2209e8c9..feef6247 100644
--- a/server/FileConverter/sources/convertermaster.js.orig
--- a/server/FileConverter/sources/convertermaster.js
+++ b/server/FileConverter/sources/convertermaster.js
@@ -90,7 +90,7 @@ if (cluster.isMaster) {
@ -118,9 +118,9 @@ index 2209e8c9..feef6247 100644
setInterval(updateLicense, 86400000);
} else {
const converter = require('./converter');
diff --git a/server/Common/sources/license.js.orig b/server/Common/sources/license.js
diff --git a/server/Common/sources/license.js b/server/Common/sources/license.js
index 8813cbac..90177d15 100644
--- a/server/Common/sources/license.js.orig
--- a/server/Common/sources/license.js
+++ b/server/Common/sources/license.js
@@ -44,23 +44,23 @@ exports.readLicense = async function () {
return [{