DocSpace-client/web/ASC.Web.Core/Users
pavelbannov 570ede7bba Merge branch 'develop' into feature/11.5.2
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +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/11.5.2 2021-05-31 13:32:51 +03:00
UserPhotoThumbnailManager.cs ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422 2021-05-24 13:26:13 +03:00
UserPhotoThumbnailSettings.cs Fix License 2020-07-08 18:30:23 +03:00
UserSortOrder.cs Added ASC.Web.Core 2019-06-07 11:59:07 +03:00