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
..
Caching	backend: updated some dll	2023-08-08 19:43:14 +03:00
Collections	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
Data	refactoring	2022-11-24 17:21:34 +03:00
DependencyInjection	refactoring	2022-04-15 12:08:06 +03:00
Geolocation	Payments: fixed price for eu	2023-05-15 19:30:14 +03:00
Log	fix build	2022-07-22 11:54:42 +03:00
Logging	fix ide001	2022-11-07 12:49:29 +03:00
Mapping	fix	2022-09-08 18:39:53 +03:00
Module	remove waste asc.common	2022-09-01 11:16:46 +03:00
Properties	added new license headers	2022-03-15 21:00:53 +03:00
protos	remove unused proto file	2022-04-02 14:59:42 +03:00
Security	Common: refactor	2023-02-17 16:29:13 +03:00
Threading	Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions	2023-08-01 11:39:57 +03:00
Utils	backend: updated some dll	2023-08-08 19:43:14 +03:00
Web	formats for editor(pr 1305)	2023-03-21 12:42:09 +03:00
ArgumentNullExceptionExtension.cs	IDE1006	2022-03-25 17:54:34 +03:00
ASC.Common.csproj	Merge branch 'hotfix/v1.1.2' into develop	2023-08-11 12:47:44 +03:00
ASC.Common.sln	init commit	2019-05-15 17:56:09 +03:00
DIHelper.cs	DI: optimization	2022-11-25 17:00:49 +03:00
GlobalUsings.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
RegionSettings.cs	set region when start app	2022-11-30 19:03:44 +03:00