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
..
Data	code cleanup	2022-04-14 22:42:15 +03:00
Modules	Merge branch 'develop' into refactoring/generic-classes	2023-03-20 21:10:08 +03:00
BackupFileInfo.cs	added new license headers	2022-03-15 21:00:53 +03:00
BackupPortalTask.cs	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00
ColumnMapper.cs	code cleanup	2022-04-14 22:42:15 +03:00
DbFactory.cs	asc.apicache	2022-12-16 15:41:09 +03:00
DeletePortalTask.cs	Merge branch 'release/rc-v1.2.0' into feature/migration_personal	2022-11-29 13:07:12 +03:00
KeyHelper.cs	migration personal: first version backup	2022-08-10 12:25:53 +03:00
PortalTaskBase.cs	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00
RestoreDbModuleTask.cs	Merge branch 'release/rc-v1.2.0' into feature/migration_personal	2022-11-29 13:07:12 +03:00
RestorePortalTask.cs	add column removed in backup_backup	2023-01-27 18:12:02 +03:00
TransferPortalTask.cs	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00