IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74d238bde8
DocSpace-client/common/ASC.Data.Backup.Core
History
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
..
Contracts merge from feature/backend-refactor 2022-03-29 23:29:03 +03:00
Core moved from ddf515b8 2022-06-02 15:42:45 +03:00
EF IDE1006 2022-03-25 17:54:34 +03:00
Exceptions code cleanup 2022-04-14 22:42:15 +03:00
Extensions Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
IntegrationEvents/Events code cleanup 2022-04-14 22:42:15 +03:00
Log Log: refactoring 2022-05-26 12:01:54 +03:00
protos refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
Service moved from ddf515b8 2022-06-16 17:16:46 +03:00
Storage Log: refactoring 2022-05-26 12:01:54 +03:00
Tasks moved from ddf515b8 2022-06-02 15:42:45 +03:00
Utils added new license headers 2022-03-15 21:00:53 +03:00
ActionInvoker.cs added new license headers 2022-03-15 21:00:53 +03:00
ASC.Data.Backup.Core.csproj Merge branch 'release/v1.2' into develop 2022-06-30 16:13:31 +03:00
BackupAjaxHandler.cs moved from ddf515b8 2022-06-14 11:11:41 +03:00
BackupFileUploadHandler.cs Merge branch 'develop' into feature/backend-refactor 2022-03-28 12:53:15 +03:00
BackupResource.az.resx az resources 2022-06-27 14:00:23 +03:00
BackupResource.Designer.cs Merge branch 'release/v1.2' into develop 2022-06-30 16:13:31 +03:00
BackupResource.el.resx Resources: backup 2022-05-12 13:22:59 +03:00
BackupResource.fr.resx Resources: backup 2022-05-12 13:22:59 +03:00
BackupResource.resx az resources 2022-06-27 14:00:23 +03:00
BackupResource.tr.resx Resources: backup 2022-05-12 13:22:59 +03:00
GlobalUsings.cs moved from ddf515b8 2022-06-02 15:42:45 +03:00