pavelbannov ebd4f7d17c Merge branch 'develop' into refactoring/generic-classes ... # Conflicts: # products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs # products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs # products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs # products/ASC.Files/Core/Utils/FileConverter.cs # products/ASC.Files/Service/Startup.cs		2023-03-20 21:10:08 +03:00
..
Api	Merge branch 'develop' into refactoring/generic-classes	2023-03-20 21:10:08 +03:00
DocStore@776d5631ee	fix	2022-08-09 17:11:40 +03:00
Extensions	nlog: fixed config	2022-09-15 18:17:23 +03:00
Helpers	Merge branch 'develop' into refactoring/generic-classes	2023-03-20 21:10:08 +03:00
Log	add loggers	2022-05-12 11:14:00 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	Files: Startup	2020-02-12 13:48:58 +03:00
ASC.Files.csproj	merge from develop	2022-12-01 14:52:46 +03:00
GlobalUsings.cs	get reference data	2022-12-13 14:00:20 +03:00
ProductEntryPoint.cs	changed action 5002 to 5034, moved RoomRemoveUser to dailyFeed, fix createRoom action, fix RoomUpdateAccessForUser action, fix userName	2023-03-09 16:40:36 +05:00
Program.cs	backend: refactoring	2023-02-20 23:10:49 +03:00
Startup.cs	WebHooks: added resources, new methods and settings for disable webhook	2023-02-08 14:17:06 +03:00