Merge pull request #276 from unidoc/master

Master into development branch
This commit is contained in:
Gunnsteinn Hall 2020-03-09 21:19:07 +00:00 committed by GitHub
commit 0f9a37df23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions

View File

@ -79,7 +79,11 @@ func (k *LicenseKey) Validate() error {
}
if k.ExpiresAt == nil {
k.ExpiresAt = &noLicenseExpiry
expiresAt := k.CreatedAt.AddDate(1, 0, 0)
if noLicenseExpiry.After(expiresAt) {
expiresAt = noLicenseExpiry
}
k.ExpiresAt = &expiresAt
}
if k.CreatedAt.After(*k.ExpiresAt) {

View File

@ -11,12 +11,12 @@ import (
)
const releaseYear = 2020
const releaseMonth = 2
const releaseDay = 10
const releaseHour = 8
const releaseMin = 50
const releaseMonth = 3
const releaseDay = 8
const releaseHour = 23
const releaseMin = 40
// Version holds version information, when bumping this make sure to bump the released at stamp also.
const Version = "3.4.0"
const Version = "3.5.0"
var ReleasedAt = time.Date(releaseYear, releaseMonth, releaseDay, releaseHour, releaseMin, 0, 0, time.UTC)