IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9d050b0c6a
DocSpace-client/common/ASC.Core.Common/Tenants
History
pavelbannov 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
..
Tenant.cs Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00
TenantAuditSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
TenantControlPanelSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
TenantCookieSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
TenantDomainValidator.cs moved from ddf515b8 2022-06-01 17:07:08 +03:00
TenantExceptions.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
TenantIndustry.cs added new license headers 2022-03-15 21:00:53 +03:00
TenantQuota.cs Payments: refactoring. TrialEnabled setting 2022-09-21 18:44:32 +03:00
TenantQuotaException.cs added new license headers 2022-03-15 21:00:53 +03:00
TenantQuotaRow.cs removed DbUsersQuotaRow 2022-10-07 16:37:57 +03:00
TenantQuotaType.cs added new license headers 2022-03-15 21:00:53 +03:00
TenantRegistrationInfo.cs Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00
TenantStatus.cs added new license headers 2022-03-15 21:00:53 +03:00
TenantTrustedDomainsType.cs added new license headers 2022-03-15 21:00:53 +03:00
TenantUserQuotaSettings.cs Quota: user quota storage core_user -> webstudio_settings 2022-09-15 15:38:31 +03:00
TenantUtil.cs removed unnecessary 2022-08-25 13:54:11 +03:00
TenantVersion.cs added new license headers 2022-03-15 21:00:53 +03:00