IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
986561d4e9
DocSpace-buildtools/common
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
..
ASC.ActiveDirectory remove wait 2023-05-24 10:15:16 +03:00
ASC.Api.Core Merge branch 'develop' into feature/optimization-ef 2023-05-30 14:13:02 +03:00
ASC.Common Merge branch 'develop' into feature/optimization-ef 2023-05-30 14:13:02 +03:00
ASC.Core.Common Merge branch 'develop' into feature/delete-portal 2023-06-08 15:53:31 +03:00
ASC.Data.Backup.Core Merge branch 'develop' into feature/delete-portal 2023-06-08 15:53:31 +03:00
ASC.Data.Encryption merge from develop 2022-12-01 14:52:46 +03:00
ASC.Data.Reassigns WebstudioDbContext -async 2023-03-24 19:24:59 +03:00
ASC.Data.Storage Merge branch 'develop' into feature/delete-portal 2023-06-08 15:53:31 +03:00
ASC.EventBus TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
ASC.EventBus.ActiveMQ migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
ASC.EventBus.Extensions.Logger Merge branch 'develop' into feature/delete-portal 2023-06-08 15:53:31 +03:00
ASC.EventBus.RabbitMQ fixed rabbitmq connection leak 2023-05-04 23:11:20 +03:00
ASC.FederatedLogin Merge branch 'develop' into feature/optimization-ef 2023-05-30 14:13:02 +03:00
ASC.Feed Merge branch 'develop' into feature/delete-portal 2023-06-08 15:53:31 +03:00
ASC.IPSecurity Merge branch 'develop' into feature/delete-portal 2023-06-08 15:53:31 +03:00
ASC.MessagingSystem Merge branch 'develop' into feature/optimization-ef 2023-05-30 14:13:02 +03:00
ASC.Migration Merge branch 'develop' into feature/optimization-ef 2023-05-30 14:13:02 +03:00
ASC.Notify.Textile added translations 2023-05-24 18:25:14 +03:00
ASC.Resource.Manager fix 2023-03-21 14:47:14 +03:00
ASC.Socket.IO socket.io: fixed routes 2023-05-10 14:16:27 +03:00
ASC.SsoAuth removed x-rewriter-url 2023-05-03 20:25:50 +03:00
ASC.Textile migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
ASC.Thumbnails moved from ddf515b8 2022-06-09 18:36:57 +03:00
ASC.UrlShortener fix nconf 2022-11-17 14:56:04 +03:00
ASC.WebDav removed x-rewriter-url 2023-05-03 20:25:50 +03:00
ASC.Webhooks.Core Merge branch 'develop' into feature/delete-portal 2023-06-08 15:53:31 +03:00
ASC.WebPlugins logger: configure logStreamName in aws logger target on startup 2023-04-13 17:41:23 +03:00
services Merge branch 'develop' into feature/delete-portal 2023-06-08 15:53:31 +03:00
Tests Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources 2023-05-16 21:53:23 +03:00
Tools Merge branch 'develop' into feature/delete-portal 2023-06-08 15:53:31 +03:00