mirror of
https://github.com/documize/community.git
synced 2025-07-18 20:59:43 +02:00
Bump version
This commit is contained in:
parent
f3ef83162e
commit
ce07d4d147
6 changed files with 37 additions and 31 deletions
|
@ -12,9 +12,9 @@ All you need to provide is your database -- PostgreSQL, Microsoft SQL Server or
|
|||
|
||||
## Latest Release
|
||||
|
||||
[Community edition: v5.2.2](https://github.com/documize/community/releases)
|
||||
[Community edition: v5.3.0](https://github.com/documize/community/releases)
|
||||
|
||||
[Community+ edition: v5.2.2](https://www.documize.com/community)
|
||||
[Community+ edition: v5.3.0](https://www.documize.com/community)
|
||||
|
||||
The Community+ edition is the "enterprise" offering with advanced capabilities and customer support:
|
||||
|
||||
|
@ -94,7 +94,7 @@ For both Community and Community+ editions, please contact our help desk for pro
|
|||
|
||||
<support@documize.com>
|
||||
|
||||
We aim to respond within two working days!
|
||||
We aim to respond within two working days.
|
||||
|
||||
## The Legal Bit
|
||||
|
||||
|
|
|
@ -49,6 +49,9 @@ const (
|
|||
// PlanSelfHost represents privately hosted Documize instance.
|
||||
PlanSelfHost Plan = "Self-host"
|
||||
|
||||
// SeatsFree is Five free users.
|
||||
SeatsFree Seats = 5
|
||||
|
||||
// Seats0 is 0 users.
|
||||
Seats0 Seats = 0
|
||||
|
||||
|
@ -88,32 +91,30 @@ type Product struct {
|
|||
|
||||
// IsValid returns if subscription is valid using RequestContext.
|
||||
func (p *Product) IsValid(ctx RequestContext) bool {
|
||||
return true
|
||||
|
||||
// Community edition is always valid.
|
||||
// if p.Edition == CommunityEdition {
|
||||
// return true
|
||||
// }
|
||||
if p.Edition == CommunityEdition {
|
||||
return true
|
||||
}
|
||||
|
||||
// Empty means we cannot be valid.
|
||||
// if ctx.Subscription.IsEmpty() {
|
||||
// return false
|
||||
// }
|
||||
if ctx.Subscription.IsEmpty() {
|
||||
return false
|
||||
}
|
||||
|
||||
// Enterprise edition is valid if system has loaded up user count by tenant.
|
||||
// if uc, ok := p.UserCount[ctx.OrgID]; ok {
|
||||
// // Enterprise edition is valid if subcription date is greater than now and we have enough users/seats.
|
||||
// if time.Now().UTC().Before(ctx.Subscription.End) && uc <= int(ctx.Subscription.Seats) {
|
||||
// return true
|
||||
// }
|
||||
// } else {
|
||||
// // First 10 is free for Enterprise edition.
|
||||
// if Seats1 == ctx.Subscription.Seats && time.Now().UTC().Before(ctx.Subscription.End) {
|
||||
// return true
|
||||
// }
|
||||
// }
|
||||
if uc, ok := p.UserCount[ctx.OrgID]; ok {
|
||||
// Enterprise edition is valid if subcription date is greater than now and we have enough users/seats.
|
||||
if time.Now().UTC().Before(ctx.Subscription.End) && uc <= int(ctx.Subscription.Seats) {
|
||||
return true
|
||||
}
|
||||
} else {
|
||||
// First 5 is free for Enterprise edition.
|
||||
if SeatsFree == ctx.Subscription.Seats && time.Now().UTC().Before(ctx.Subscription.End) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
// return false
|
||||
return false
|
||||
}
|
||||
|
||||
// SubscriptionData holds encrypted data and is unpacked into Subscription.
|
||||
|
@ -161,8 +162,10 @@ type SubscriptionUserAccount struct {
|
|||
// SubscriptionAsXML returns subscription data as XML document:
|
||||
//
|
||||
// <DocumizeLicense>
|
||||
//
|
||||
// <Key>some key</Key>
|
||||
// <Signature>some signature</Signature>
|
||||
//
|
||||
// </DocumizeLicense>
|
||||
//
|
||||
// XML document is empty in case of error.
|
||||
|
|
|
@ -40,9 +40,9 @@ func main() {
|
|||
// Specify the product edition.
|
||||
rt.Product = domain.Product{}
|
||||
rt.Product.Major = "5"
|
||||
rt.Product.Minor = "2"
|
||||
rt.Product.Patch = "2"
|
||||
rt.Product.Revision = "220912123425"
|
||||
rt.Product.Minor = "3"
|
||||
rt.Product.Patch = "0"
|
||||
rt.Product.Revision = "220918142046"
|
||||
rt.Product.Version = fmt.Sprintf("%s.%s.%s", rt.Product.Major, rt.Product.Minor, rt.Product.Patch)
|
||||
rt.Product.Edition = domain.CommunityEdition
|
||||
rt.Product.Title = "Community"
|
||||
|
|
2
go.mod
2
go.mod
|
@ -1,6 +1,6 @@
|
|||
module github.com/documize/community
|
||||
|
||||
go 1.18
|
||||
go 1.19
|
||||
|
||||
require (
|
||||
github.com/BurntSushi/toml v0.3.1
|
||||
|
|
|
@ -173,7 +173,10 @@ let constants = EmberObject.extend({
|
|||
Seats5: 250,
|
||||
|
||||
// Seats6 is unlimited.
|
||||
Seats6: 9999
|
||||
Seats6: 9999,
|
||||
|
||||
// SeatsFree is x users free for Enterprise edition.
|
||||
SeatsFree: 5
|
||||
},
|
||||
|
||||
Icon: { // eslint-disable-line ember/avoid-leaking-state-in-ember-objects
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "documize",
|
||||
"version": "5.2.2",
|
||||
"version": "5.3.0",
|
||||
"private": true,
|
||||
"description": "Documize Community",
|
||||
"repository": "",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue