|
72b0a81f51
|
fix
|
2022-06-17 20:51:01 +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 |
|
|
945e9d8efe
|
moved from ddf515b8
|
2022-06-17 18:46:16 +03:00 |
|
|
b62ba1d729
|
fix tests
|
2022-06-17 10:17:17 +03:00 |
|
|
56ece27e1b
|
moved from ddf515b8
|
2022-06-16 17:16:46 +03:00 |
|
|
c9fb0d3dac
|
moved from ddf515b8
|
2022-06-16 11:13:53 +03:00 |
|
|
f3f3ed96ae
|
moved from ddf515b8
|
2022-06-15 12:46:21 +03:00 |
|
|
35bebe49f9
|
moved from ddf515b8
|
2022-06-14 11:11:41 +03:00 |
|
|
46ba74cc6f
|
moved from ddf515b8
|
2022-06-09 20:33:08 +03:00 |
|
|
a3fec128b5
|
log: fixed character case
|
2022-06-09 19:37:59 +03:00 |
|
|
a9b826f8f5
|
moved from ddf515b8
|
2022-06-09 18:36:57 +03:00 |
|
|
9edcce8858
|
moved from ddf515b8
|
2022-06-09 15:11:45 +03:00 |
|
|
7b1ea58cdf
|
fileconverter: moved timer to separete worker service
|
2022-06-08 17:25:25 +03:00 |
|
|
cbd73be90b
|
moved from ddf515b8
|
2022-06-08 12:02:40 +03:00 |
|
|
c1d152becc
|
moved from ddf515b8
|
2022-06-07 21:00:08 +03:00 |
|
|
8c56de7a26
|
moved from ddf515b8
|
2022-06-05 18:44:37 +03:00 |
|
|
b6e82bd7c9
|
moved from ddf515b8
|
2022-06-02 19:24:28 +03:00 |
|
|
6b2ba0d4ed
|
moved from ddf515b8
|
2022-06-02 15:42:45 +03:00 |
|
|
34370cf6e2
|
fix socketio
|
2022-06-01 20:24:50 +03:00 |
|
|
a861268e4f
|
moved from ddf515b8
|
2022-06-01 17:07:08 +03:00 |
|
|
3ebd67f444
|
merge from develop
|
2022-06-01 14:44:30 +03:00 |
|
|
cc4f8a15b0
|
unified config style
|
2022-05-31 16:04:24 +03:00 |
|
|
fc94f2f445
|
moved from ddf515b8
|
2022-05-30 19:13:50 +03:00 |
|
|
e7886aff2c
|
Log: refactoring
|
2022-05-26 12:01:54 +03:00 |
|
|
e01858d2e8
|
merge from develop
|
2022-05-25 16:58:31 +03:00 |
|
|
e6d7979e92
|
dbcontext: EnableRetryOnFailure for MySQL provider
|
2022-05-25 16:55:38 +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 |
|
|
b525696b03
|
fix usings
|
2022-05-24 18:41:28 +03:00 |
|
|
02570e12cf
|
Merge branch 'develop' into feature/cluster-services
|
2022-05-24 17:24:25 +03:00 |
|
|
4507ca6549
|
update nlog
|
2022-05-24 10:41:07 +03:00 |
|
|
2a673036ff
|
encryption service: migrate from ICacheNotify to RabbitMQ
|
2022-05-23 22:06:22 +03:00 |
|
|
13ad4381f7
|
Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
|
2022-05-23 18:48:23 +03:00 |
|
|
79b713804e
|
telegram: refactoring
|
2022-05-23 12:21:04 +03:00 |
|
|
91c4e454c5
|
add loggers
|
2022-05-20 18:24:41 +03:00 |
|
|
a585a425bc
|
fix
|
2022-05-20 17:02:09 +03:00 |
|
|
75da995099
|
Merge branch 'develop' into feature/logger-refactoring
|
2022-05-20 17:01:51 +03:00 |
|
|
f5baafdfa2
|
Merge pull request #649 from ONLYOFFICE/feature/logger-Feed.Aggregator
Feature/logger feed.aggregator
|
2022-05-20 16:21:18 +03:00 |
|
|
cc807b3ba0
|
Merge pull request #647 from ONLYOFFICE/feature/logger-Data.Backup.Core
Feature/logger data.backup.core
|
2022-05-20 16:20:39 +03:00 |
|
|
ac9b82dba4
|
Merge pull request #645 from ONLYOFFICE/feature/logger-ClearEvents
Feature/logger clear events
|
2022-05-20 16:18:59 +03:00 |
|
|
3911d4837b
|
fix
|
2022-05-20 16:07:47 +03:00 |
|
|
a47c33f950
|
fix
|
2022-05-20 15:53:38 +03:00 |
|
|
7bc2d18b79
|
fix
|
2022-05-20 15:47:32 +03:00 |
|
|
cb525d4929
|
Merge pull request #654 from ONLYOFFICE/feature/logger-MessagingSystem
logger-MessagingSystem
|
2022-05-19 17:20:04 +03:00 |
|
|
d6eed4b8d7
|
Merge pull request #644 from ONLYOFFICE/feature/logger-AuditTrail
Feature/logger audit trail
|
2022-05-19 15:57:06 +03:00 |
|
|
0096efcd04
|
Merge pull request #657 from ONLYOFFICE/feature/logger-TelegramService
Feature/logger telegram service
|
2022-05-19 15:54:30 +03:00 |
|
|
d9da7c8773
|
Merge pull request #643 from ONLYOFFICE/feature/logger-Api.Core
logger-Api.Core
|
2022-05-19 15:49:36 +03:00 |
|
|
f94409cc7c
|
Merge pull request #655 from ONLYOFFICE/feature/logger-Notify
logger-Notify
|
2022-05-19 14:47:16 +03:00 |
|
|
8d25b80ce0
|
Merge pull request #653 from ONLYOFFICE/feature/logger-IPSecurity
Feature/logger ip security
|
2022-05-19 14:07:52 +03:00 |
|
|
e602d183ab
|
Merge pull request #646 from ONLYOFFICE/feature/logger-Data.Backup.BackgroundTasks
Feature/logger data.backup.background tasks
|
2022-05-19 13:41:57 +03:00 |
|
|
f0fc4cce50
|
Merge pull request #648 from ONLYOFFICE/feature/logger-EventBus.RabbitMQ
Feature/logger event bus.rabbit mq
|
2022-05-19 13:24:25 +03:00 |
|