|
|
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 |
|
|
|
b62ba1d729
|
fix tests
|
2022-06-17 10:17:17 +03:00 |
|
|
|
56ece27e1b
|
moved from ddf515b8
|
2022-06-16 17:16:46 +03:00 |
|
|
|
430542b2ea
|
moved from ddf515b8
|
2022-06-16 11:35:24 +03:00 |
|
|
|
c9fb0d3dac
|
moved from ddf515b8
|
2022-06-16 11:13:53 +03:00 |
|
|
|
59f50effc5
|
Merge branch 'develop' into bugfix/fix-private-room
|
2022-06-15 14:48:49 +03:00 |
|
|
|
f3f3ed96ae
|
moved from ddf515b8
|
2022-06-15 12:46:21 +03:00 |
|
|
|
c37af416da
|
Files: fix 404
|
2022-06-15 10:41:59 +03:00 |
|
|
|
35bebe49f9
|
moved from ddf515b8
|
2022-06-14 11:11:41 +03:00 |
|
|
|
d132f0d565
|
fileconverter: refactoring
|
2022-06-09 17:38:27 +03:00 |
|
|
|
22b341c942
|
fileconverter: added logs
|
2022-06-09 17:02:19 +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 |
|
|
|
c1d152becc
|
moved from ddf515b8
|
2022-06-07 21:00:08 +03:00 |
|
|
|
8c56de7a26
|
moved from ddf515b8
|
2022-06-05 18:44:37 +03:00 |
|
|
|
3757174d08
|
fix test
|
2022-06-01 20:25:03 +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 |
|
|
|
8b92df64e4
|
crm: fix logs
|
2022-05-31 18:34:04 +03:00 |
|
|
|
ee7dddac5d
|
crm: fix crm api
|
2022-05-31 17:01:58 +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 |
|
|
|
5599fc9809
|
Merge branch 'develop' into feature/remove-application/x-www-form-urlencoded
|
2022-05-24 17:09:33 +03:00 |
|
|
|
13ad4381f7
|
Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
|
2022-05-23 18:48:23 +03:00 |
|
|
|
6cb3ea538e
|
fix crm
|
2022-05-23 11:02:52 +03:00 |
|
|
|
91c4e454c5
|
add loggers
|
2022-05-20 18:24:41 +03:00 |
|
|
|
75da995099
|
Merge branch 'develop' into feature/logger-refactoring
|
2022-05-20 17:01:51 +03:00 |
|
|
|
19d219ba84
|
Merge pull request #650 from ONLYOFFICE/feature/logger-Files.Core
Feature/logger files.core
|
2022-05-20 16:22:16 +03:00 |
|
|
|
be9c7ffd12
|
fix
|
2022-05-20 16:15:13 +03:00 |
|
|
|
52cdf0758e
|
fix crm
|
2022-05-19 18:47:59 +03:00 |
|
|
|
b0b7b19874
|
Merge pull request #656 from ONLYOFFICE/feature/logger-People
logger-People
|
2022-05-19 17:06:12 +03:00 |
|
|
|
f812c8e052
|
Merge pull request #652 from ONLYOFFICE/feature/logger-Files
Feature/logger files
|
2022-05-19 16:14:47 +03:00 |
|
|
|
36855d656f
|
remove application/x-www-form-urlencoded
|
2022-05-17 12:29:24 +03:00 |
|
|
|
9ed3b1cb2f
|
fix tests
|
2022-05-16 13:58:45 +03:00 |
|
|
|
d0525e298c
|
thumbnails, notify, telegram: migrate from ICacheNotify to EventBus
|
2022-05-13 22:14:00 +03:00 |
|
|
|
f4727b411e
|
Test: fix
|
2022-05-13 18:08:30 +03:00 |
|
|
|
14f25c2da7
|
Test: fix
|
2022-05-13 14:48:51 +03:00 |
|
|
|
5d3013f44d
|
add logger
|
2022-05-13 14:24:01 +03:00 |
|
|
|
c21898f2e0
|
add logger
|
2022-05-13 12:33:44 +03:00 |
|
|
|
969c037d3c
|
Merge branch 'develop' into feature/fix-tests
|
2022-05-13 12:27:30 +03:00 |
|
|
|
122affb8a2
|
add loggers
|
2022-05-12 18:35:48 +03:00 |
|
|
|
a0f67cfe27
|
add loggers
|
2022-05-12 11:14:00 +03:00 |
|
|
|
84121f4451
|
fix
|
2022-04-29 17:26:21 +03:00 |
|
|
|
cf0e9c322d
|
ElasticSearch: fix
|
2022-04-29 16:17:52 +03:00 |
|
|
|
31c289a26b
|
fix-tests: change dir for log and products
|
2022-04-29 13:48:29 +03:00 |
|
