Commit Graph

56 Commits

Author SHA1 Message Date
96d9dc9058 downgrade AspNetCore.HealthChecks.Elasticsearch 2023-03-07 15:30:08 +03:00
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
52b23cbf8b healthcheck: added to ApiSystem/ClearEvents services. refactoring 2022-10-31 16:13:45 +03:00
c1208e931a added support ActiveMQ EventBus 2022-10-12 14:43:00 +03:00
ee27ad4437 nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property 2022-09-15 17:44:04 +03:00
5b8374daa0 refactoring 2022-08-18 19:00:22 +03:00
9d3bc076b9
Merge pull request #747 from ONLYOFFICE/feature/fix-api
Feature/fix api
2022-08-02 11:59:47 +03:00
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
4559942c30 fix confrim links 2022-08-01 13:50:31 +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
4507ca6549 update nlog 2022-05-24 10:41:07 +03:00
d0525e298c thumbnails, notify, telegram: migrate from ICacheNotify to EventBus 2022-05-13 22:14:00 +03:00
19cf415898 backend: updated packages version 2022-04-27 13:02:17 +03:00
1dff9e18c4 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Api.Core/Core/CustomHealthCheck.cs
#	common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.IPSecurity/IPRestrictionsRepository.cs
#	common/ASC.IPSecurity/IPRestrictionsService.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-04-21 17:51:31 +03:00
3e4e293775 Api: downgrade AspNetCore.HealthChecks.Elasticsearch, because we need to use Nest 7.10 2022-04-19 13:48:11 +03:00
2f06b0a013 EventBus: refactoring 2022-04-01 19:12:53 +03:00
90623263e9 merge from feature/backend-refactor 2022-03-29 23:29:03 +03:00
e9671701cb Autofact.Extensions.DependencyInjection package moved to ASC.Api.Core 2022-03-21 17:39:01 +03:00
6e4761b8c2 Systemd package moved to shared ASC.Api.Core 2022-03-21 16:40:09 +03:00
cb6b77e216 ApiCore: updated packages 2022-03-16 12:59:04 +03:00
d45373619d update StackExchange.Redis.*.dll 2022-03-10 15:56:30 +03:00
2585c22b3b merge from feature/backend-refactor 2022-03-09 12:10:30 +03:00
99378a027e Csproj: ImplicitUsings 2022-03-05 11:20:05 +03:00
9ca71764ef EventBus: added ASC.EventBus.MemoryCache for testing. Refactoring. 2022-02-28 17:48:55 +03:00
70ed0d72b7 added IntegrationEventLog from eShopOnContainers template. refactoring. 2022-02-14 14:18:58 +03:00
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +03:00
8ca88e4620 Merge branch 'develop' into feature/net6
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
2021-11-23 16:40:50 +03:00
735a9b60cf net6: warning CA1416
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
Vashchuk Nikita
45d221a109 Split webhooks into service and core 2021-08-26 21:43:41 +03:00
dd9e5e9b5d Merge branch 'develop' into feature/webhooks 2021-08-26 15:17:53 +03:00
b791586252 net6 2021-08-25 18:26:13 +03:00
a0f5c4231f fixed run via vs 2021-08-23 15:55:19 +03:00
Vashchuk Nikita
9f0e41b880 Merge branch 'develop' into feature/webhooks 2021-08-23 12:36:01 +03:00
672de09a90 NLog: up to 4.7.10 2021-08-08 15:55:27 +03:00
Vashchuk Nikita
afdd1ab982 Added CustomMiddleware(WebhooksMiddleware.cs) 2021-07-28 13:10:14 +03:00
20d1f9a738 merge from develop 2021-06-23 16:10:46 +03:00
5fcbdbd7dd added health checks 2021-06-16 16:54:36 +03:00
92ce702b28 crm: refactoring. bugfix 2021-05-05 17:09:05 +03:00
0dbadc6394 from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects 2021-04-30 18:42:10 +03:00
a66f99f574 net5.0 2020-11-15 18:55:57 +03:00
4501d3229a Nuget: replaced thirdparty 2020-08-20 17:50:08 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00
c9939b0da1 .net core up to 3.1 2019-12-06 12:12:51 +03:00
afb1f90e9a .net core up to 3.0.0 2019-09-24 14:20:58 +03:00