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
..
AuditModuleSpecifics.cs	added new license headers	2022-03-15 21:00:53 +03:00
CoreModuleSpecifics.cs	add column removed in backup_backup	2023-01-27 18:12:02 +03:00
FilesModuleSpecifics.cs	refactoring: add all in selectors	2023-02-10 17:11:10 +03:00
Helpers.cs	Backup: added collaborator group	2023-02-17 11:27:48 +03:00
IModuleSpecifics.cs	Bug 63557 - Settings: Restore.	2023-08-07 17:06:46 +03:00
ModuleProvider.cs	Bug 63557 - Settings: Restore.	2023-08-07 17:06:46 +03:00
ModuleSpecificsBase.cs	fix	2022-09-13 17:11:23 +03:00
RoomLogosModuleSpecifics.cs	Bug 63557 - Settings: Restore.	2023-08-07 17:06:46 +03:00
TenantsModuleSpecifics.cs	Bug 62403 - Settings:Restore. backup tenants_tariffrow	2023-05-06 00:02:00 +03:00
WebStudioModuleSpecifics.cs	removed unused variables	2022-12-09 17:47:46 +03:00