pavelbannov 7f1d946269 Merge branch 'develop' into feature/stripe ... # Conflicts: # packages/client/src/Shell.jsx # packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js # packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js # packages/client/src/pages/PortalSettings/index.js # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.People/Server/Api/UserController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Core/HttpHandlers/SsoHandler.cs		2022-09-23 16:11:23 +03:00
..
Import	refactoring	2022-04-15 12:08:06 +03:00
CustomNamingPeople.cs	Settings: ignore id	2022-07-12 15:33:46 +03:00
UserHelpTourSettings.cs	Settings: ignore id	2022-07-12 15:33:46 +03:00
UserInfoComparer.cs	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
UserInfoExtension.cs	refactoring	2022-04-15 12:08:06 +03:00
UserManagerWrapper.cs	Merge branch 'develop' into feature/stripe	2022-09-23 16:11:23 +03:00
UserPhotoManager.cs	Api: fixed delete method	2022-08-31 22:27:30 +03:00
UserPhotoThumbnailManager.cs	Files: removed .result	2022-08-12 16:26:57 +03:00
UserPhotoThumbnailSettings.cs	Settings: ignore id	2022-07-12 15:33:46 +03:00
UserSortOrder.cs	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00