Commit Graph

42 Commits

Author SHA1 Message Date
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +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
26511d9fb7 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Tests.sln
2021-10-29 13:18:57 +03:00
8c7815d9a5
Merge pull request #427 from ONLYOFFICE/feature/sc
Feature/sc
2021-10-28 18:49:01 +03:00
40dc6a8e86 fix loading products 2021-10-28 16:07:14 +03:00
403388fbf1 Added solution filter
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
5a5e299d98 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
2021-10-19 18:30:59 +03:00
0f833ae1de net6: warning SYSLIB0020 2021-10-01 13:26:36 +03:00
315665e87a BuildAndDeploy 2021-09-23 20:58:39 +03:00
2e20b4958d fix CookieAuthHandler 2021-09-08 13:16:58 +03:00
Vashchuk Nikita
3b4cb1dfc6 Added GlobalFilter, fix 2021-09-03 17:02:52 +03:00
Vashchuk Nikita
45d221a109 Split webhooks into service and core 2021-08-26 21:43:41 +03:00
Vashchuk Nikita
c851641b6c Merge remote-tracking branch 'remotes/origin/feature/webhooks' into feature/webhooks 2021-08-23 13:01:48 +03:00
Vashchuk Nikita
9f0e41b880 Merge branch 'develop' into feature/webhooks 2021-08-23 12:36:01 +03:00
Vashchuk Nikita
e1c648e06a Merge branch 'develop' into feature/webhooks 2021-08-19 13:49:16 +03:00
Vashchuk Nikita
7d4b22ca83 added tests, migrations 2021-08-19 12:11:26 +03:00
16469eb138 Api: added ConfigureNLogLogging 2021-08-08 15:56:54 +03:00
Vashchuk Nikita
afdd1ab982 Added CustomMiddleware(WebhooksMiddleware.cs) 2021-07-28 13:10:14 +03:00
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
1268a436ca Startup: fix load products 2021-07-16 11:56:14 +03:00
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
a23b23de3c Startup: added ability to skip load products and consumers 2021-06-24 11:15:20 +03:00
20d1f9a738 merge from develop 2021-06-23 16:10:46 +03:00
3788bab48e HealthCheck: fix Studio 2021-06-22 19:55:47 +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
NikitaVashchuk
3eb3cef5a3 fix 2021-04-20 10:55:52 +03:00
8ff27ff1be added ControllerNameAttributeConvention 2021-04-02 18:46:00 +03:00
f0e227731f Fixed loading products, lazy loading webitemmanager 2021-01-26 12:29:50 +03:00
f6ca373137 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
79ea471098 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Core.Common/BaseCommonLinkUtility.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Migration/Program.cs
#	common/services/ASC.Notify/NotifyServiceLauncher.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Socket.IO.Svc/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Thumbnails.Svc/Program.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-11-04 15:22:43 +03:00
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +03:00
049e8f63e9 Refactoring: scope. 2020-10-29 11:13:51 +03:00
e9a9b320e8 Scope: refactoring. Notify, People 2020-10-27 18:34:22 +03:00
367c93fd91 Refactoring: scope 2020-10-22 20:57:18 +03:00
3ddb202c56 Scope: refactoring 2020-10-21 14:52:44 +03:00
f56f231c91 Refactoring: scope 2020-10-19 22:04:07 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
181ac04fd8 DI: register fix 2020-10-18 19:34:30 +03:00
e10ac2ccfa BaseStartup: refactoring 2020-07-15 15:33:44 +03:00
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +03:00