Sergey Linnik b2235b90cb Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop ... # Conflicts: # common/ASC.Api.Core/Model/EmployeeFullDto.cs # common/ASC.Core.Common/Core/UserInfo.cs # common/ASC.Core.Common/EF/FireBaseUser.cs # common/ASC.Core.Common/Tenants/TenantQuota.cs # common/ASC.IPSecurity/Models/IPRestriction.cs # common/services/ASC.Data.Backup/Api/BackupController.cs # products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs # products/ASC.Files/Core/ApiModels/RequestDto/ExternalShareRequestDto.cs # products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs # products/ASC.Files/Core/Helpers/DocumentService.cs # products/ASC.Files/Core/Services/DocumentService/Configuration.cs # products/ASC.Files/Server/Api/EditorController.cs # products/ASC.Files/Server/Api/FilesController.cs # products/ASC.Files/Server/Api/FoldersController.cs # products/ASC.Files/Server/Api/OperationController.cs # products/ASC.Files/Server/Api/SecurityController.cs # products/ASC.Files/Server/Api/SettingsController.cs # products/ASC.Files/Server/Api/TagsController.cs # products/ASC.Files/Server/Api/ThirdpartyController.cs # products/ASC.Files/Server/Api/UploadController.cs # products/ASC.Files/Server/Api/VirtualRoomsController.cs # products/ASC.People/Server/Api/ContactsController.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/SecurityController.cs # web/ASC.Web.Api/Api/Settings/CustomNavigationController.cs # web/ASC.Web.Api/Api/Settings/IpRestrictionsController.cs # web/ASC.Web.Api/Api/Settings/LdapController.cs # web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs # web/ASC.Web.Api/Api/Settings/NotificationController.cs # web/ASC.Web.Api/Api/Settings/SecurityController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Api/Api/Settings/SsoController.cs # web/ASC.Web.Api/Api/Settings/StorageController.cs # web/ASC.Web.Api/Api/Settings/VersionController.cs # web/ASC.Web.Api/Api/Settings/WebhooksController.cs # web/ASC.Web.Api/Api/Settings/WhitelabelController.cs # web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksConfigRequestsDto.cs # web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs # web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs		2023-08-01 17:07:05 +03:00
..
ASC.ActiveDirectory	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ASC.Api.Core	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ASC.Common	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ASC.Core.Common	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ASC.Data.Backup.Core	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ASC.Data.Encryption
ASC.Data.Reassigns	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ASC.Data.Storage	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ASC.EventBus
ASC.EventBus.ActiveMQ	fix await using	2023-06-01 14:27:27 +03:00
ASC.EventBus.Extensions.Logger	fix	2023-06-28 20:10:44 +03:00
ASC.EventBus.RabbitMQ	Merge branch 'develop' into feature/optimization-queries	2023-06-01 23:52:40 +03:00
ASC.FederatedLogin	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ASC.Feed	fix query	2023-06-30 12:22:37 +03:00
ASC.IPSecurity	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ASC.MessagingSystem	Merge branch 'develop' into feature/optimization-queries	2023-06-01 23:52:40 +03:00
ASC.Migration	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
ASC.Notify.Textile	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
ASC.Resource.Manager
ASC.Socket.IO	Merge branch 'master' into develop	2023-08-01 14:39:31 +03:00
ASC.SsoAuth	Node: Services: Added new logLevel param	2023-07-24 14:03:52 +04:00
ASC.Textile	Fix documentation warnings	2023-03-29 19:25:20 +05:00
ASC.Thumbnails
ASC.WebDav	removed x-rewriter-url	2023-05-03 20:25:50 +03:00
ASC.Webhooks.Core	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ASC.WebPlugins	logger: configure logStreamName in aws logger target on startup	2023-04-13 17:41:23 +03:00
services	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
Tests	Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources	2023-05-16 21:53:23 +03:00
Tools	UrlShortener: fix migrations	2023-07-26 15:17:07 +03:00