Commit Graph

27 Commits

Author SHA1 Message Date
0a27a98511 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-21 10:52:53 +03:00
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
0d1239af95 add thumbnails for video 2022-06-16 16:43:29 +03:00
9edcce8858 moved from ddf515b8 2022-06-09 15:11:45 +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
d0525e298c thumbnails, notify, telegram: migrate from ICacheNotify to EventBus 2022-05-13 22:14:00 +03:00
c21898f2e0 add logger 2022-05-13 12:33:44 +03:00
13bbce8ea4 Custom logger replaced with Microsoft.Extensions.Logging 2022-04-26 20:53:48 +03:00
6ecc8e7071 code cleanup 2022-04-14 22:42:15 +03:00
4fe34215c9
Merge pull request #580 from ONLYOFFICE/feature/files-mapping
Feature/files mapping
2022-03-29 16:59:43 +04:00
244e345ac6 Merge 'feature/backend-refactor' into feature/builder-extensions 2022-03-22 15:57:46 +03:00
cf8c1ba3ff Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-21 18:52:09 +03:00
ff79769307 Files: improvements for automapping 2022-03-18 11:51:33 +03:00
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
5e2f575483 added builders extensions 2022-03-10 20:30:29 +03:00
26066ccb7f Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-10 12:19:18 +03:00
13ff29413d FIles: added mapping 2022-03-09 15:07:57 +03:00
78fafb08ab Microsoft.NET.Sdk.Worker 2022-03-05 18:38:42 +03:00
4e08a6f2cf Files: fix 2022-03-03 14:25:09 +03:00
71bfac088f added usings 2022-02-25 17:31:21 +03:00
66021c7885 Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor 2022-02-25 17:30:59 +03:00
178671ea56 FilesService: add implicit 2022-02-24 23:55:29 +03:00
b3317f35fc FilesService: used WebApplicationBuilder 2022-02-24 11:58:41 +03:00
5b5ed4a4e3 Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor 2022-02-18 18:55:59 +03:00
9c08a5c52e Feed: moved feed migrations to ASC.Feed, resolved usings 2022-02-18 18:30:53 +03:00
ab58c28bbe FeedAggreagator: Feed Aggregator Service is divided into Aggregator and Cleaner 2022-02-11 14:39:42 +03:00
73dcc81db4 refactoring: add globalusings: files.service 2022-01-30 00:37:07 +03:00