Commit Graph

21 Commits

Author SHA1 Message Date
0a8f262826 fix 2022-11-24 12:14:38 +03:00
df450b1dd3 added slnf 2022-11-23 18:26:50 +03:00
26df50c457 remove unused projects 2022-09-08 17:05:35 +03:00
e2b1e48fa9 removed voip service 2022-07-15 18:46:52 +03:00
e17f49e344 Merge branch 'develop' into feature/LDAP-new
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/GlobalUsings.cs
2022-06-28 14:30:40 +03:00
8c56de7a26 moved from ddf515b8 2022-06-05 18:44:37 +03:00
Nikita
3e663061da added activeDirectory to slnf 2022-05-24 13:15:44 +03:00
9eba173a44 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Model/CreateFileModel.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2022-04-21 22:36:29 +03:00
60d728695c fix slnf 2022-04-21 18:56:04 +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
61a127413c delete svc projects 2022-03-01 15:54:23 +03:00
9ca71764ef EventBus: added ASC.EventBus.MemoryCache for testing. Refactoring. 2022-02-28 17:48:55 +03:00
88c7f5ba72 Merge branch 'feature/backend-refactor' into feature/winsw 2022-02-25 11:18:26 +03:00
7e67e9a41c merge from develop 2022-02-24 17:33:02 +03:00
d4e48004bc added socketio 2022-02-24 13:47:18 +03:00
6f1ab3515f delete urlShortener.svc 2022-02-22 15:54:44 +03:00
70ed0d72b7 added IntegrationEventLog from eShopOnContainers template. refactoring. 2022-02-14 14:18:58 +03:00
f3b3b08af1 add support rabbitmq. split ASC.Data.Backup service on two services 2022-02-04 20:44:03 +03:00
3b7f02339b Webhooks: fix 2021-10-29 20:02:45 +03:00
3ce15a9329 refactoring build scripts 2021-10-26 16:14:34 +03:00