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
..
Caching	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
Collections	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
Data	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
DependencyInjection	refactoring	2022-04-15 12:08:06 +03:00
Geolocation	code cleanup	2022-04-14 22:42:15 +03:00
Log	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
Logging	Custom logger replaced with Microsoft.Extensions.Logging	2022-04-26 20:53:48 +03:00
Mapping	Merge branch 'feature/backend-refactor' into feature/files-mapping	2022-03-21 18:52:09 +03:00
Module	added new license headers	2022-03-15 21:00:53 +03:00
Properties	added new license headers	2022-03-15 21:00:53 +03:00
protos	remove unused proto file	2022-04-02 14:59:42 +03:00
Security	IDE1006	2022-03-25 19:26:06 +03:00
Threading	add loggers	2022-05-06 12:40:38 +03:00
Utils	Merge branch 'develop' into feature/logger-refactoring	2022-05-20 17:01:51 +03:00
Web	fixed warnings	2022-04-14 22:23:57 +03:00
ArgumentNullExceptionExtension.cs	IDE1006	2022-03-25 17:54:34 +03:00
ASC.Common.csproj	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
ASC.Common.sln
DIHelper.cs	refactoring	2022-04-15 12:08:06 +03:00
GlobalUsings.cs	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00