Commit Graph

20069 Commits

Author SHA1 Message Date
Sergey Kirichenko
7529aabaca Modify docker build 2022-06-07 10:37:38 +03:00
Sergey Kirichenko
22f158bcbb Del build docker image ASC.Thumbnails 2022-06-02 14:48:34 +03:00
Sergey Kirichenko
0d714d89b4 Fix build 2022-06-02 12:08:50 +03:00
Sergey Kirichenko
c9a9746ef4 Del build storage-migration, storage-encryption 2022-06-02 11:28:39 +03:00
Sergey Kirichenko
be23489069 Modify build docker services 2022-06-02 10:50:36 +03:00
Sergey Kirichenko
dd77ba43d2 Fix 2022-06-01 17:04:02 +03:00
Sergey Kirichenko
6127118f63 Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into feature/appserver-develop-docker-build 2022-06-01 11:00:27 +03:00
Sergey Kirichenko
bae7a6a1cb Modify docker-entrypoint run file 2022-06-01 09:48:55 +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
Sergey Kirichenko
a6f672398e Fix 2022-05-31 10:37:28 +03:00
Sergey Kirichenko
65e5074fd9 Fix build ASC.SsoAuth 2022-05-31 08:37:13 +03:00
Sergey Kirichenko
907e3222d6 Modify docker image building 2022-05-30 23:21:45 +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
Sergey Kirichenko
3d0d56d0fd Modify docker-entrypoint 2022-05-25 12:00:22 +03:00
Sergey Kirichenko
fd9b837edc Fix build 2022-05-25 11:55:07 +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
Sergey Kirichenko
3dcd1048b9 Build 2022-05-24 12:16:47 +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
f812c8e052
Merge pull request #652 from ONLYOFFICE/feature/logger-Files
Feature/logger files
2022-05-19 16:14:47 +03:00