pavelbannov a66c03aa86 Merge branch 'develop' into feature/logger-refactoring ... # Conflicts: # common/ASC.Common/Caching/AscCache.cs # common/ASC.Common/GlobalUsings.cs # common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs # common/ASC.Data.Storage/GlobalUsings.cs # common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs # common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs # common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs # common/services/ASC.Notify/GlobalUsings.cs # common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs # common/services/ASC.Notify/Services/NotifySenderService.cs # common/services/ASC.TelegramService/GlobalUsings.cs # common/services/ASC.TelegramService/TelegramHandler.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/GlobalUsings.cs # products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Api/Api/Settings/StorageController.cs		2022-05-24 23:13:57 +03:00
..
Billing	fix	2022-05-06 10:58:15 +03:00
Caching	refactoring	2022-04-15 12:08:06 +03:00
Configuration	code cleanup	2022-04-14 22:42:15 +03:00
Context	add loggers in core.common	2022-05-05 17:13:47 +03:00
Core	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
Data	add loggers in core.common	2022-05-05 17:13:47 +03:00
EF	telegram: update dependency	2022-05-17 18:27:34 +03:00
Encryption	fix usings	2022-05-24 18:41:28 +03:00
Hosting	add loggers in core.common	2022-05-05 17:13:47 +03:00
Log	fix	2022-05-06 10:58:15 +03:00
Migrations	added new license headers	2022-03-15 21:00:53 +03:00
Notify	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
Properties	code cleanup	2022-04-14 22:42:15 +03:00
protos	encryption service: migrate from ICacheNotify to RabbitMQ	2022-05-23 22:06:22 +03:00
Security	add loggers in core.common	2022-05-05 17:13:47 +03:00
Settings	Custom logger replaced with Microsoft.Extensions.Logging	2022-04-26 20:53:48 +03:00
Tenants	fixed warnings	2022-04-14 22:23:57 +03:00
Tests	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00
Users	Merge branch 'develop' into feature/backend-refactor	2022-04-21 17:51:31 +03:00
WhiteLabel	refactoring	2022-04-01 19:17:21 +03:00
ASC.Core.Common.csproj	encryption service: migrate from ICacheNotify to RabbitMQ	2022-05-23 22:06:22 +03:00
BaseCommonLinkUtility.cs	fix	2022-05-06 10:58:15 +03:00
ByteConverter.cs	added new license headers	2022-03-15 21:00:53 +03:00
GeolocationHelper.cs	add loggers in core.common	2022-05-05 17:13:47 +03:00
GlobalUsings.cs	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
HostedSolution.cs	IDE1006	2022-03-25 19:26:06 +03:00
MultiRegionHostedSolution.cs	refactoring	2022-04-15 12:08:06 +03:00