|
|
dc71761710
|
Settings: TenantDomainValidator
|
2023-01-26 15:31:06 +03:00 |
|
|
|
aa0222f078
|
Merge branch 'develop' into feature/migration_personal
|
2022-11-11 15:05:26 +03:00 |
|
|
|
14a64f4ad0
|
Merge branch 'develop' into feature/remove-waste
# Conflicts:
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Program.cs
# common/services/ASC.ApiSystem/Startup.cs
# products/ASC.CRM/Server/Classes/Global.cs
# products/ASC.Files/Server/ProductEntryPoint.cs
# web/ASC.Web.Core/QuotaSync.cs
|
2022-11-07 11:25:54 +03:00 |
|
|
|
a414d68182
|
Merge branch 'develop' into feature/migration_personal
# Conflicts:
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/CrmModuleSpecifics.cs
# common/ASC.Data.Storage/StorageFactory.cs
|
2022-10-28 12:16:36 +03:00 |
|
|
|
afc9d1ce17
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-19 14:18:52 +03:00 |
|
|
|
1a5c273825
|
refactor
|
2022-10-18 14:43:31 +03:00 |
|
|
|
7af080486c
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-18 14:32:17 +03:00 |
|
|
|
a2d144514d
|
refactor
|
2022-10-18 14:22:02 +03:00 |
|
|
|
ed22136269
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-17 14:31:57 +03:00 |
|
|
|
e2ccab3c97
|
ApiSystem: fix
|
2022-10-14 17:52:00 +03:00 |
|
|
|
4dbf1e70b7
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.ActiveDirectory/GlobalUsings.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
|
2022-10-10 19:16:03 +03:00 |
|
|
|
5b96dbdb55
|
removed DbUsersQuotaRow
|
2022-10-07 16:37:57 +03:00 |
|
|
|
130e485a0c
|
Payments: refactoring. TrialEnabled setting
|
2022-09-21 18:44:32 +03:00 |
|
|
|
9c8bf9708a
|
Payment: UsersInRoomStatistic
|
2022-09-20 23:22:27 +03:00 |
|
|
|
ccbbc5499e
|
Quota: MaxFileSizeChecker
|
2022-09-19 22:49:41 +03:00 |
|
|
|
5740b578db
|
Payment: rename
|
2022-09-19 18:20:21 +03:00 |
|
|
|
4b0fc12efc
|
Payment: rename
|
2022-09-19 18:03:25 +03:00 |
|
|
|
53e0146a26
|
Quota: countroom
|
2022-09-15 17:44:48 +03:00 |
|
|
|
cfb0c957e9
|
Quota: user quota storage core_user -> webstudio_settings
|
2022-09-15 15:38:31 +03:00 |
|
|
|
90c3cd29ba
|
fix
|
2022-09-13 22:35:54 +03:00 |
|
|
|
af6fa993e6
|
Payments: added quota feature type
|
2022-09-13 18:18:43 +03:00 |
|
|
|
896e1a7aeb
|
fix
add checks new alias, fix backup
|
2022-09-13 17:11:23 +03:00 |
|
|
|
6f710be0c2
|
Quota: refactoring
|
2022-09-09 17:39:28 +03:00 |
|
|
|
acbacaf9ef
|
Quota: removed MaxFileSize column
|
2022-09-09 15:13:54 +03:00 |
|
|
|
87cfb294ab
|
Quota: CountRoomFeature
|
2022-09-09 10:27:35 +03:00 |
|
|
|
83f4545f02
|
Quota: refactoring
|
2022-09-08 10:23:26 +03:00 |
|
|
|
375853bf8e
|
Quota: removed hasMigrationFeature
|
2022-09-07 19:35:07 +03:00 |
|
|
|
e2dc47adea
|
Quota: merge autobackup and restore feature
|
2022-09-07 16:43:37 +03:00 |
|
|
|
4b183c2fa1
|
Quota: removed open feature
|
2022-09-07 16:28:52 +03:00 |
|
|
|
f54f31a3d1
|
remove waste asc.core.common
|
2022-09-07 15:45:23 +03:00 |
|
|
|
ddeb4157ad
|
Quota: used field
|
2022-09-06 23:30:19 +03:00 |
|
|
|
2c758355bc
|
Quota: added used field
|
2022-09-06 18:35:30 +03:00 |
|
|
|
941689b6ca
|
Quota: refactoring
|
2022-09-06 12:14:08 +03:00 |
|
|
|
9154b971c0
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/index.js
# packages/common/api/settings/index.js
# packages/common/components/Loaders/index.js
|
2022-08-29 13:06:44 +03:00 |
|
|
|
641695ec51
|
Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController
|
2022-08-25 23:09:12 +03:00 |
|
|
|
ff8e3c38e9
|
removed unnecessary
|
2022-08-25 13:54:11 +03:00 |
|
|
|
0a29eb33f7
|
Quota: fix
|
2022-08-25 13:41:52 +03:00 |
|
|
|
551ba285d6
|
CoreCommon: do not modify the source quota when multiplying
|
2022-08-25 09:15:59 +03:00 |
|
|
|
7a9e46bf54
|
Quota: refactoring
|
2022-08-24 19:05:15 +03:00 |
|
|
|
d00205106f
|
CoreCommon: delete support feature from quota
|
2022-08-12 15:57:34 +03:00 |
|
|
|
8908521291
|
CoreCommon: delete domain feature from quota (f3f3ed96ae)
|
2022-08-12 15:57:34 +03:00 |
|
|
|
90c19508ea
|
CoreCommon: tariff contains a list of quotas
|
2022-08-12 15:57:31 +03:00 |
|
|
|
64782b49bf
|
CoreCommon: Year field in TenantQuota is not used
|
2022-08-12 15:57:30 +03:00 |
|
|
|
9025541b0a
|
CoreCommon: Year3 field in TenantQuota is not used
|
2022-08-12 15:57:30 +03:00 |
|
|
|
91c03420e1
|
CoreCommon: EnableMailServer field in TenantQuota is not used
|
2022-08-12 15:57:29 +03:00 |
|
|
|
055ad130b4
|
CoreCommon: CountRoom as a new field in TenantQuota
|
2022-08-12 15:57:29 +03:00 |
|
|
|
891f9bf0f1
|
CoreCommon: ActiveUsers as feature value
|
2022-08-12 15:57:29 +03:00 |
|
|
|
74460213a8
|
CoreCommon: MaxTotalSize as feature value
|
2022-08-12 15:57:28 +03:00 |
|
|
|
4218e45601
|
CoreCommon: rename AvangateId field to ProductId
|
2022-08-12 15:57:28 +03:00 |
|
|
|
c1be6ecb61
|
Settings: ignore id
|
2022-07-12 15:33:46 +03:00 |
|
