pavelbannov 74d238bde8 Merge branch 'release/v1.2' into develop ... # Conflicts: # common/ASC.Common/Caching/KafkaCache.cs # common/ASC.Common/Logging/Log.cs # common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs # common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs # common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj # common/ASC.Data.Backup.Core/BackupResource.Designer.cs # common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs # common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs # common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs # common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs # common/ASC.Data.Storage/S3/S3Storage.cs # common/ASC.Notify.Textile/ASC.Notify.Textile.csproj # common/services/ASC.AuditTrail/ASC.AuditTrail.csproj # products/ASC.Files/Core/ASC.Files.Core.csproj # products/ASC.Files/Core/Core/Compress/CompressToArchive.cs # products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs # products/ASC.Files/Core/Core/Compress/CompressToZip.cs # products/ASC.Files/Core/Core/Compress/ICompress.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs # products/ASC.Files/Core/Helpers/Global.cs # products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs # products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs # products/ASC.Files/Core/Utils/EntryManager.cs # web/ASC.Web.Api/ASC.Web.Api.csproj # web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs # web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs		2022-06-30 16:13:31 +03:00
..
Billing	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
Caching	moved from ddf515b8	2022-06-01 17:07:08 +03:00
Configuration	code cleanup	2022-04-14 22:42:15 +03:00
Context	Merge branch 'develop' into feature/docspace	2022-06-20 12:15:08 +03:00
Core	moved from ddf515b8	2022-06-01 17:07:08 +03:00
Data	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
EF	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
Encryption	fix usings	2022-05-24 18:41:28 +03:00
Hosting	refactoring	2022-06-21 12:57:20 +03:00
Log	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
Messaging	fix	2022-06-23 11:48:31 +03:00
Migrations	fix tests	2022-06-17 10:17:17 +03:00
Notify	Merge branch 'release/v1.2' into develop	2022-06-30 16:13:31 +03:00
Properties	code cleanup	2022-04-14 22:42:15 +03:00
protos	encryption service: migrate from ICacheNotify to RabbitMQ	2022-05-23 22:06:22 +03:00
Radicale	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
Security	Merge branch 'develop' into feature/docspace	2022-06-20 12:15:08 +03:00
Settings	Custom logger replaced with Microsoft.Extensions.Logging	2022-04-26 20:53:48 +03:00
Tenants	moved from ddf515b8	2022-06-01 17:07:08 +03:00
Tests	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00
Users	Merge branch 'release/v1.2' into develop	2022-06-30 16:13:31 +03:00
WhiteLabel	refactoring	2022-04-01 19:17:21 +03:00
ASC.Core.Common.csproj	encryption service: migrate from ICacheNotify to RabbitMQ	2022-05-23 22:06:22 +03:00
BaseCommonLinkUtility.cs	moved from ddf515b8	2022-06-01 17:07:08 +03:00
ByteConverter.cs	added new license headers	2022-03-15 21:00:53 +03:00
GeolocationHelper.cs	Log: refactoring	2022-05-26 12:01:54 +03:00
GlobalUsings.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
HostedSolution.cs	moved from ddf515b8	2022-06-01 17:07:08 +03:00
MultiRegionHostedSolution.cs	refactoring	2022-04-15 12:08:06 +03:00