Commit Graph

20063 Commits

Author SHA1 Message Date
2b88f8ac71 Web: Integration: Added base api for creating integration iframe component 2022-06-15 12:52:46 +03:00
20b85665e1
Merge pull request #691 from ONLYOFFICE/feature/refactoring-file-converter
fileconverter: moved timer to separete worker service
2022-06-15 13:32:59 +04:00
a3fec128b5 log: fixed character case 2022-06-09 19:37:59 +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
7b1ea58cdf fileconverter: moved timer to separete worker service 2022-06-08 17:25:25 +03:00
3757174d08 fix test 2022-06-01 20:25:03 +03:00
34370cf6e2 fix socketio 2022-06-01 20:24:50 +03:00
27e3f061ef
Merge pull request #679 from ONLYOFFICE/feature/db_enable_retry_on_failure
Feature/db enable retry on failure
2022-06-01 19:30:22 +03:00
3ebd67f444 merge from develop 2022-06-01 14:44:30 +03:00
427e8c5642
Merge pull request #684 from ONLYOFFICE/feature/crm-fix-api-and-logs
Feature/crm fix api and logs
2022-06-01 11:11:54 +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
f6d0b91898
Merge pull request #683 from ONLYOFFICE/feature/unified-config-style
unified config style
2022-05-31 16:25:43 +03:00
cc4f8a15b0 unified config style 2022-05-31 16:04:24 +03:00
cf8badeea3 Api: refactoring 2022-05-27 12:32:58 +03:00
7585aa898e
Merge pull request #672 from ONLYOFFICE/feature/logger-refactoring
Feature/logger refactoring
2022-05-26 12:22:44 +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
7ce16eeb3e
Merge pull request #676 from ONLYOFFICE/feature/nlog-5.0
update nlog
2022-05-24 21:58:59 +03:00
994bf92f06 Nlog: removed default settings.
Disabled Microsoft log except Microsoft.AspNetCore.Hosting.Diagnostics
2022-05-24 21:58:15 +03:00
426e14b243
Merge pull request #675 from ONLYOFFICE/feature/cluster-services
Feature/cluster services
2022-05-24 18:41:58 +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
bb600fc32e
Merge pull request #668 from ONLYOFFICE/feature/remove-application/x-www-form-urlencoded
remove application/x-www-form-urlencoded
2022-05-24 17:15:07 +03:00
5599fc9809 Merge branch 'develop' into feature/remove-application/x-www-form-urlencoded 2022-05-24 17:09:33 +03:00
e20370be5d
Merge pull request #673 from ONLYOFFICE/feature/fix-crm
Feature/fix crm
2022-05-24 17:07:18 +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
6cb3ea538e fix crm 2022-05-23 11:02:52 +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
19d219ba84
Merge pull request #650 from ONLYOFFICE/feature/logger-Files.Core
Feature/logger files.core
2022-05-20 16:22:16 +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
6295c0779d
Merge pull request #659 from ONLYOFFICE/feature/logger-Web.Core
Feature/logger web.core
2022-05-20 16:18:02 +03:00
be9c7ffd12 fix 2022-05-20 16:15:13 +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
52cdf0758e fix crm 2022-05-19 18:47:59 +03:00
9cf0601400
Merge pull request #658 from ONLYOFFICE/feature/logger-Web.Api
Feature/logger web.api
2022-05-19 17:51:46 +03:00
cb525d4929
Merge pull request #654 from ONLYOFFICE/feature/logger-MessagingSystem
logger-MessagingSystem
2022-05-19 17:20:04 +03:00
b0b7b19874
Merge pull request #656 from ONLYOFFICE/feature/logger-People
logger-People
2022-05-19 17:06:12 +03:00