Commit Graph

86 Commits

Author SHA1 Message Date
7d1ccbdc15 remove distributed_task_cache.proto from projects 2022-04-05 13:14:44 +03:00
90623263e9 merge from feature/backend-refactor 2022-03-29 23:29:03 +03:00
cd1d3058ff DistributedTaskQueue refactoring 2022-03-25 19:15:28 +03:00
4e78af53f9 refactoring DistributedTaskQueue 2022-03-22 15:10:05 +03:00
8c9db226ac Common: updated packages 2022-03-16 13:44:47 +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
609427bf20 merge from feature/backend-refactor 2022-03-01 15:57:49 +03:00
053da2933d added EventBus and EventBusRabbitMQ from eShoponContainers template 2022-02-10 17:42:21 +03:00
b2e779d7d8 Merge branch 'feature/backend-refactor' into feature/asc-common-refactor 2022-02-04 23:27:29 +03:00
9395c23081 Merge branch 'develop' into feature/cluster-services-backup 2022-02-04 21:00:27 +03:00
f3b3b08af1 add support rabbitmq. split ASC.Data.Backup service on two services 2022-02-04 20:44:03 +03:00
4097f72e94 Common: used file-scope namespaces, remove unnecessary 2022-02-03 18:26:44 +03:00
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
efb51c613f refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +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
26511d9fb7 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Tests.sln
2021-10-29 13:18:57 +03:00
315665e87a BuildAndDeploy 2021-09-23 20:58:39 +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
44847c1e8f backend: change TargetFramework from netstandard2.1 to net5.0 2021-08-06 18:37:22 +03:00
a0b34c5cc9 Webhook: fix 2021-07-31 20:12:41 +03:00
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
2021-06-16 17:02:46 +03:00
73547f421e Common: install newtonsoft 2021-06-15 16:44:53 +03:00
b925943cb6 merge from develop 2021-06-07 17:23:25 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
424c6a6806 migrate base mapper class from ASC.CRM to ASC.Common 2021-04-30 17:52:57 +03:00
560d803d86 Common: added assembly version 2021-04-09 11:12:10 +03:00
ee6ffd3ace Updated packages 2021-04-06 20:16:24 +03:00
65e1c72c01 Sln: fixed packages 2021-03-26 12:26:12 +03:00
b25dd2d6e2 .net 5 2021-02-25 12:02:28 +03:00
036ddc87c3 5.0.2 2021-01-22 16:49:38 +03:00
f222f4be0c .net 5 2021-01-22 16:42:26 +03:00
1675896294 Merge branch 'develop' into feature/dotnet5
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
2020-12-04 11:59:10 +03:00
ed22ffb326 Files: bugfix and optimization 2020-11-25 18:40:23 +03:00
d2a0d318f7 dotnet 5 2020-11-17 12:59:15 +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
3ddb202c56 Scope: refactoring 2020-10-21 14:52:44 +03:00
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +03:00
5eed00dd28 Removed sq bugs and code smells 2020-10-16 16:21:59 +03:00
e6be6f5072 References updated 2020-10-16 10:27:44 +03:00
f69281a07d References updated 2020-10-15 21:30:16 +03:00