Vashchuk Nikita 5aa99ec811 Merge branch 'develop' into feature/async ... # Conflicts: # common/ASC.Common/Caching/KafkaCache.cs # common/ASC.Data.Backup.Core/Storage/BackupRepository.cs # common/services/ASC.AuditTrail/AuditEventsRepository.cs # common/services/ASC.AuditTrail/LoginEventsRepository.cs # products/ASC.Files/Core/ASC.Files.Core.csproj # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs # products/ASC.Files/Core/Utils/MailMergeTask.cs # products/ASC.Files/Server/ASC.Files.csproj # products/ASC.Files/Service/Thumbnail/FileDataProvider.cs		2022-02-04 16:04:52 +03:00
..
Import	fix	2020-08-27 17:01:37 +03:00
CustomNamingPeople.cs	Settings: fixed custom schemaName	2021-04-14 21:08:27 +03:00
UserHelpTourSettings.cs	Auth by thirdparty	2021-02-19 19:16:08 +03:00
UserInfoComparer.cs	fix	2020-08-27 17:01:37 +03:00
UserInfoExtension.cs	fix	2020-08-27 17:01:37 +03:00
UserManagerWrapper.cs	Auth by thirdparty	2021-02-19 19:16:08 +03:00
UserPhotoManager.cs	Merge branch 'develop' into feature/async	2022-02-04 16:04:52 +03:00
UserPhotoThumbnailManager.cs	fix	2021-11-25 11:23:35 +03:00
UserPhotoThumbnailSettings.cs	net6: replacing System.Drawing with ImageSharp	2021-10-18 14:24:05 +03:00
UserSortOrder.cs	Added ASC.Web.Core	2019-06-07 11:59:07 +03:00