DocSpace-client/common/ASC.Api.Core
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
..
Auth UserDbContext - async 2023-03-24 10:53:49 +03:00
Convention added new license headers 2022-03-15 21:00:53 +03:00
Core Merge branch 'hotfix/v1.1.2' into develop 2023-08-11 12:47:44 +03:00
Extensions fixed ArgumentOutOfRangeException 2023-08-04 17:42:14 +03:00
Log refactoring 2022-08-09 19:13:07 +03:00
Middleware Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
Model Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
Routing fixed Bug 62708 2023-05-23 15:02:01 +03:00
Security fix build 2023-07-19 14:34:00 +03:00
ASC.Api.Core.csproj Merge branch 'hotfix/v1.1.2' into develop 2023-08-11 12:47:44 +03:00
GlobalUsings.cs asc.apicache 2022-12-16 15:41:09 +03:00