downgrade without lock

2025-01-26 15:50:51 +01:00 · 2025-01-26 15:50:51 +01:00 · 0c616cbdcb
parent cdbb8ef17c
commit 0c616cbdcb
3 changed files with 66 additions and 63 deletions
--- a/local-production-linux.json
+++ b/local-production-linux.json
@ -5,13 +5,16 @@
                "savetimeoutdelay": 15000
            },
            "expire": {
-                "sessionidle": "1h",
+                "sessionidle": "10h",
                "sessionabsolute": "1d"
            },
            "autoAssembly": {
                "enable": true,
                "interval": "1m"
            },
+            "lock": {
+                "enable": false
+            },
            "callbackBackoffOptions": {
                "retries": 5,
                "timeout": {
--- a/patches/server/0001-fix-licences.patch
+++ b/patches/server/0001-fix-licences.patch
@ -1,5 +1,5 @@
 From fd17b0f68640cb90b81f516af52ab71e0242d410 Mon Sep 17 00:00:00 2001
-From: Fabrice <fabrice.roublot@workstreams.ch>
+From: WS-Bot <contact@workstreams.ch>
 Date: Mon, 14 Oct 2024 16:57:02 +0200
 Subject: [PATCH] fix licences

@ -17,77 +17,77 @@ index fc8756b9..c1a9a7ff 100644
 --- a/Common/sources/commondefines.js
 +++ b/Common/sources/commondefines.js
@@ -1173,8 +1173,8 @@ const FileStatus = {
-   NeedPassword: 9
- };
- 
-const buildVersion = '4.1.2';
-const buildNumber = 37;
-+const buildVersion = '8.1.3';
-+const buildNumber = 2;
- 
- exports.TaskQueueData = TaskQueueData;
- exports.CMailMergeSendData = CMailMergeSendData;
+   NeedPassword: 9
+ };
+ 
+-const buildVersion = '4.1.2';
+-const buildNumber = 37;
+const buildVersion = '8.1.3';
+const buildNumber = 2;
+ 
+ exports.TaskQueueData = TaskQueueData;
+ exports.CMailMergeSendData = CMailMergeSendData;
 diff --git a/Common/sources/constants.js b/Common/sources/constants.js
 index ffaabaf7..003aa099 100644
 --- a/Common/sources/constants.js
 +++ b/Common/sources/constants.js
@@ -87,9 +87,9 @@ exports.LICENSE_RESULT = {
-   NotBefore: 16
- };
- 
-exports.LICENSE_CONNECTIONS = 20;
-exports.LICENSE_USERS = 3;
-exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
-+exports.LICENSE_CONNECTIONS = 999999;
-+exports.LICENSE_USERS = 999999;
-+exports.LICENSE_EXPIRE_USERS_ONE_DAY = new Date("2999-01-01T23:59:59.000Z").getTime() / 1000; // day in seconds
- 
- exports.AVS_OFFICESTUDIO_FILE_UNKNOWN =  0x0000;
- exports.AVS_OFFICESTUDIO_FILE_DOCUMENT = 0x0040;
+   NotBefore: 16
+ };
+ 
+-exports.LICENSE_CONNECTIONS = 20;
+-exports.LICENSE_USERS = 3;
+-exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
+exports.LICENSE_CONNECTIONS = 999999;
+exports.LICENSE_USERS = 999999;
+exports.LICENSE_EXPIRE_USERS_ONE_DAY = new Date("2999-01-01T23:59:59.000Z").getTime() / 1000; // day in seconds
+ 
+ exports.AVS_OFFICESTUDIO_FILE_UNKNOWN =  0x0000;
+ exports.AVS_OFFICESTUDIO_FILE_DOCUMENT = 0x0040;
 diff --git a/Common/sources/license.js b/Common/sources/license.js
 index 5df8d693..2764be54 100644
 --- a/Common/sources/license.js
 +++ b/Common/sources/license.js
@@ -34,7 +34,7 @@
- 
- const constants = require('./constants');
- 
-const buildDate = '6/29/2016';
-+const buildDate = '2024-08-27T14:34:00.000Z';
- const oBuildDate = new Date(buildDate);
- 
- exports.readLicense = function*() {
+ 
+ const constants = require('./constants');
+ 
+-const buildDate = '6/29/2016';
+const buildDate = '2024-08-27T14:34:00.000Z';
+ const oBuildDate = new Date(buildDate);
+ 
+ exports.readLicense = function*() {
@@ -47,21 +47,21 @@ exports.readLicense = function*() {
- 		light: false,
- 		packageType: constants.PACKAGE_TYPE_OS,
- 		mode: constants.LICENSE_MODE.None,
-		branding: false,
-+		branding: true,
- 		connections: constants.LICENSE_CONNECTIONS,
- 		connectionsView: constants.LICENSE_CONNECTIONS,
-		customization: false,
-		advancedApi: false,
-		usersCount: 0,
-		usersViewCount: 0,
-+		customization: true,
-+		advancedApi: true,
-+		usersCount: constants.LICENSE_CONNECTIONS,
-+		usersViewCount: constants.LICENSE_CONNECTIONS,
- 		usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
-		hasLicense: false,
-		plugins: false,
-+		hasLicense: true,
-+		plugins: true,
- 		buildDate: oBuildDate,
- 		startDate: startDate,
-		endDate: null,
-+		endDate: new Date("2099-01-01T23:59:59.000Z"),
- 		customerId: "",
-		alias: ""
-+		alias: "community"
- 	}, null];
- };
- 
+ 		light: false,
+ 		packageType: constants.PACKAGE_TYPE_OS,
+ 		mode: constants.LICENSE_MODE.None,
+-		branding: false,
+		branding: true,
+ 		connections: constants.LICENSE_CONNECTIONS,
+ 		connectionsView: constants.LICENSE_CONNECTIONS,
+-		customization: false,
+-		advancedApi: false,
+-		usersCount: 0,
+-		usersViewCount: 0,
+		customization: true,
+		advancedApi: true,
+		usersCount: constants.LICENSE_CONNECTIONS,
+		usersViewCount: constants.LICENSE_CONNECTIONS,
+ 		usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
+-		hasLicense: false,
+-		plugins: false,
+		hasLicense: true,
+		plugins: true,
+ 		buildDate: oBuildDate,
+ 		startDate: startDate,
+-		endDate: null,
+		endDate: new Date("2099-01-01T23:59:59.000Z"),
+ 		customerId: "",
+-		alias: ""
+		alias: "community"
+ 	}, null];
+ };
+ 
 diff --git a/FileConverter/package.json b/FileConverter/package.json
 index 6b6207b1..a0ccb02b 100644
 --- a/FileConverter/package.json
--- a/patches/web-apps/0001-add-mobile.patch
+++ b/patches/web-apps/0001-add-mobile.patch
@ -1,5 +1,5 @@
 From de497cfe4ac6a6cdb522bb7463624c91d282b721 Mon Sep 17 00:00:00 2001
-From: Fabrice <fabrice.roublot@workstreams.ch>
+From: WS-Bot <contact@workstreams.ch>
 Date: Mon, 14 Oct 2024 16:57:25 +0200
 Subject: [PATCH] add mobile