pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/release/v7.0.0' into develop

Browse Source 
# Conflicts:
#	Common/package.json
#	Common/sources/license.js
This commit is contained in:
Sergey Konovalov
2021-12-20 18:37:03 +03:00
parent c126950843 4655233ca2
commit b9bcbab109
20 changed files with 502 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Common/sources/license.js
View File

@ -39,6 +39,8 @@ const oBuildDate = new Date(buildDate);
exports.readLicense = function*() {
const c_LR = constants.LICENSE_RESULT;
var now = new Date();
var startDate = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1));//first day of current month
return [{
count: 1,
type: c_LR.Success,
@ -53,6 +55,7 @@ exports.readLicense = function*() {
hasLicense: false,
plugins: false,
buildDate: oBuildDate,
startDate: startDate,
endDate: null,
customerId: ""
}, null];