IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42db5576b5
DocSpace-buildtools/common/ASC.Core.Common/Core
History
pavelbannov 986561d4e9 Merge branch 'develop' into feature/delete-portal 
# Conflicts:
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Caching/CachedQuotaService.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Core/ITenantService.cs
#	common/ASC.Core.Common/Data/DbAzService.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Data/DbUserService.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Storage/TenantQuotaController.cs
#	common/ASC.Feed/Data/FeedAggregateDataProvider.cs
#	common/ASC.Feed/Data/FeedReadedDataProvider.cs
#	common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
#	common/services/ASC.ApiSystem/Controllers/PeopleController.cs
#	migrations/mysql/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/postgre/FilesDbContext/FilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/ConnectionsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/LicenseController.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
#	web/ASC.Web.Core/Sms/SmsManager.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2023-06-08 15:53:31 +03:00
..
AccountLoginType.cs People: new filter AccountLoginType 2023-05-17 11:20:27 +03:00
AzRecord.cs add dbTenant in models and rename "tenant" to "tenantid" 2023-04-25 00:17:29 +03:00
DBResourceManager.cs removed unused variables 2022-12-09 16:34:00 +03:00
EmployeeActivationStatus.cs added new license headers 2022-03-15 21:00:53 +03:00
EmployeeStatus.cs added new license headers 2022-03-15 21:00:53 +03:00
EmployeeType.cs Core: added collaborator group and type 2023-02-17 11:27:27 +03:00
Group.cs add dbTenant in models and rename "tenant" to "tenantid" 2023-04-25 00:17:29 +03:00
GroupInfo.cs Common: added interface IRuleData 2022-12-06 01:48:02 +03:00
IAzService.cs UserDbContext - async 2023-03-24 10:53:49 +03:00
IncludeType.cs added new license headers 2022-03-15 21:00:53 +03:00
IQuotaService.cs CoreDbContext -async 2023-03-14 23:44:44 +03:00
ISubscriptionService.cs UserDbContext - async 2023-03-24 10:53:49 +03:00
ITenantService.cs Merge branch 'develop' into feature/delete-portal 2023-06-08 15:53:31 +03:00
IUserService.cs Merge branch 'develop' into feature/optimization-ef 2023-05-30 14:13:02 +03:00
Payments.cs Merge branch 'develop' into feature/users-payments-filter 2022-11-29 22:24:50 +03:00
RegionHelper.cs Merge branch 'develop' into feature/optimization-ef 2023-05-30 14:13:02 +03:00
SubscriptionMethod.cs added new license headers 2022-03-15 21:00:53 +03:00
SubscriptionRecord.cs added functionality for notifying users about events via AuditEvent, 2023-02-21 13:35:01 +05:00
TenantRegistrationInfo.cs rename file 2022-10-27 15:33:06 +03:00
UserGroupRef.cs add dbTenant in models and rename "tenant" to "tenantid" 2023-04-25 00:17:29 +03:00
UserGroupRefType.cs enum generator 2022-07-05 16:58:11 +03:00
UserInfo.cs add dbTenant in models and rename "tenant" to "tenantid" 2023-04-25 00:17:29 +03:00