diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71cd01d88792cc61c089401d09e42da3aac13682..98ccc13b6716fb006d3c4c81ebdb974c57efad9f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: - PRODUCT_VERSION: "7.1.1" - BUILD_NUMBER: "23" + PRODUCT_VERSION: "7.2.1" + BUILD_NUMBER: "34" build: image: docker:latest stage: build diff --git a/server.patch b/server.patch index 5cd94b509f6b5b918d97571870366dac20c85401..d0569ac6a374567c3fe948ea43a9dc585ac7e98f 100644 --- a/server.patch +++ b/server.patch @@ -1,9 +1,9 @@ diff --git a/Common/sources/constants.js b/Common/sources/constants.js -index 0663ead..5be45b0 100644 +index 65d4c6f..acbb6f4 100644 --- a/Common/sources/constants.js +++ b/Common/sources/constants.js -@@ -75,8 +75,8 @@ exports.LICENSE_RESULT = { - ExpiredLimited: 11 +@@ -83,8 +83,8 @@ exports.LICENSE_RESULT = { + UsersViewCountOS: 15 }; -exports.LICENSE_CONNECTIONS = 20; @@ -14,10 +14,10 @@ index 0663ead..5be45b0 100644 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 c273afe..7129cf2 100644 +index 1b617c6..fa52b81 100644 --- a/Common/sources/license.js +++ b/Common/sources/license.js -@@ -45,15 +45,15 @@ exports.readLicense = function*() { +@@ -45,18 +45,18 @@ exports.readLicense = function*() { count: 1, type: c_LR.Success, light: false, @@ -26,9 +26,12 @@ index c273afe..7129cf2 100644 mode: constants.LICENSE_MODE.None, branding: false, connections: constants.LICENSE_CONNECTIONS, + connectionsView: constants.LICENSE_CONNECTIONS, - customization: false, + customization: true, + advancedApi: false, usersCount: 0, + usersViewCount: 0, usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY, - hasLicense: false, - plugins: false, @@ -37,7 +40,7 @@ index c273afe..7129cf2 100644 buildDate: oBuildDate, startDate: startDate, endDate: null, -@@ -61,4 +61,4 @@ exports.readLicense = function*() { +@@ -65,4 +65,4 @@ exports.readLicense = function*() { }, null]; };