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
..
BusinessObjects	Merge branch 'develop' into feature/analizators	2022-01-31 14:35:16 +03:00
Classes	Init Calendar Server back-end	2021-04-21 21:47:27 +03:00
Configuration	Calendar: translations	2021-04-23 16:01:14 +03:00
Controllers	Merge branch 'develop' into feature/analizators	2022-01-31 14:35:16 +03:00
Core	net6: warning CA1416	2021-10-13 11:07:03 +03:00
ExternalCalendars	net6: warning CA1416	2021-10-13 11:07:03 +03:00
iCalParser	fixed solution build	2022-02-07 22:15:32 +03:00
Models	analizators/U2U1025	2022-01-13 14:19:39 +03:00
Notification	net6: warning CA1416	2021-10-13 11:07:03 +03:00
Properties	Merge branch 'develop' into feature/calendar	2021-05-18 13:24:02 +03:00
Resources	az resources	2022-06-27 14:00:23 +03:00
.gitignore	init Calendar	2020-02-12 10:58:31 +03:00
AccessRights.cs	net6: warning CA1416	2021-10-13 11:07:03 +03:00
appsettings.json	Init Calendar Server back-end	2021-04-21 21:47:27 +03:00
ASC.Calendar.csproj	cache: return support kafka. refactoring	2022-01-27 15:20:51 +03:00
CalendarProduct.cs	init Calendar	2020-02-12 10:58:31 +03:00
Program.cs	add support rabbitmq. split ASC.Data.Backup service on two services	2022-02-04 20:44:03 +03:00
Startup.cs	cache: return support kafka. refactoring	2022-01-27 15:20:51 +03:00