Ilya Oleshko e531654c54 Merge branch 'hotfix/v1.1.2' into develop ... # Conflicts: # build/build.backend.docker.ps1 # build/build.backend.docker.sh # common/ASC.Api.Core/ASC.Api.Core.csproj # common/ASC.Common/ASC.Common.csproj # common/ASC.Core.Common/Context/SecurityContext.cs # common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs # common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj # common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs # config/nginx/onlyoffice.conf # packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js # packages/client/src/pages/AccountsHome/Section/Filter/index.js # packages/client/src/pages/PortalSettings/categories/integration/index.js # packages/common/api/files/index.js # packages/components/.storybook/preview.js # packages/components/package.json # packages/editor/src/server/lib/helpers/index.js # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.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/ProviderFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs # products/ASC.Files/Server/Api/OperationController.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Core/Users/UserManagerWrapper.cs # yarn.lock		2023-08-11 12:47:44 +03:00
..
Import	refactoring	2022-04-15 12:08:06 +03:00
CustomNamingPeople.cs	Merge branch 'develop' into feature/optimization-ef	2023-05-17 11:01:32 +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	UserDbContext - async	2023-03-24 10:53:49 +03:00
UserManagerWrapper.cs	Merge branch 'hotfix/v1.1.2' into develop	2023-08-11 12:47:44 +03:00
UserPhotoManager.cs	fix await using	2023-06-01 14:27:27 +03:00
UserPhotoThumbnailManager.cs	WebstudioDbContext -async	2023-03-24 19:24:59 +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