pavelbannov 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
..
ApiControllerBase.cs	added new license headers	2022-03-15 21:00:53 +03:00
EditorController.cs	merge feature/backend-refactor	2022-03-29 16:12:36 +03:00
FilesController.cs	Merge branch 'develop' into feature/backend-refactor	2022-04-21 17:51:31 +03:00
FoldersController.cs	Merge branch 'develop' into feature/backend-refactor	2022-04-21 17:51:31 +03:00
MasterFormController.cs	Merge branch 'feature/backend-refactor' into feature/files-controller-refactor	2022-03-21 19:03:57 +03:00
OperationController.cs	Merge branch 'feature/backend-refactor' into feature/files-controller-refactor	2022-03-21 19:03:57 +03:00
PrivacyRoomController.cs	Merge branch 'feature/backend-refactor' into feature/files-controller-refactor	2022-03-21 19:03:57 +03:00
SecutiryController.cs	Merge branch 'develop' into feature/backend-refactor	2022-04-21 17:51:31 +03:00
SettingsController.cs	added new license headers	2022-03-15 21:00:53 +03:00
TagsController.cs	Merge branch 'feature/backend-refactor' into feature/files-controller-refactor	2022-03-21 19:03:57 +03:00
ThirdpartyController.cs	Merge branch 'feature/backend-refactor' into feature/files-controller-refactor	2022-03-21 19:03:57 +03:00
UploadController.cs	Merge branch 'feature/backend-refactor' into feature/files-controller-refactor	2022-03-21 19:03:57 +03:00