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
..
Client	Web: Files: deleted useless folders after merge.	2022-03-22 13:22:51 +03:00
Core	Merge branch 'develop' into feature/backend-refactor	2022-04-21 17:51:31 +03:00
Server	Merge branch 'develop' into feature/backend-refactor	2022-04-21 17:51:31 +03:00
Service	code cleanup	2022-04-14 22:42:15 +03:00
Tests	Merge pull request #580 from ONLYOFFICE/feature/files-mapping	2022-03-29 16:59:43 +04:00