pavelbannov 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
..
Api	Merge branch 'develop' into feature/backend-refactor	2022-04-21 22:36:29 +03:00
ApiModels	Merge branch 'develop' into feature/backend-refactor	2022-04-21 17:51:31 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
Resources	removed past license headers	2022-03-15 19:59:24 +03:00
.gitignore	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
appsettings.json	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
ASC.People.csproj	Autofact.Extensions.DependencyInjection package moved to ASC.Api.Core	2022-03-21 17:39:01 +03:00
GlobalUsings.cs	code cleanup	2022-04-14 22:42:15 +03:00
PeopleProduct.cs	IDE1006	2022-03-25 19:26:06 +03:00
Program.cs	refactor	2022-03-23 19:23:25 +03:00
Startup.cs	refactoring	2022-04-15 12:08:06 +03:00