|
8ea04bcc81
|
Merge branch 'develop' into feature/12.0
# Conflicts:
# common/ASC.MessagingSystem/Data/MessagesRepository.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
|
2022-06-17 19:19:00 +03:00 |
|
|
a3fec128b5
|
log: fixed character case
|
2022-06-09 19:37:59 +03:00 |
|
|
9edcce8858
|
moved from ddf515b8
|
2022-06-09 15:11:45 +03:00 |
|
|
8c56de7a26
|
moved from ddf515b8
|
2022-06-05 18:44:37 +03:00 |
|
|
e7886aff2c
|
Log: refactoring
|
2022-05-26 12:01:54 +03:00 |
|
|
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 |
|
|
901e82b3af
|
add warnings
|
2022-05-16 13:12:11 +03:00 |
|
|
41926b6de8
|
public to internal
|
2022-05-06 14:02:16 +03:00 |
|
|
2156e1f847
|
add loggers
|
2022-05-06 12:40:38 +03:00 |
|
|
92c6844810
|
fix
|
2022-05-06 10:58:15 +03:00 |
|
|
0b63b5eba6
|
replace commonLogger
|
2022-05-05 17:53:14 +03:00 |
|