IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59e0105bb6
DocSpace-client/common/services/ASC.Data.Storage.Encryption
History
pavelbannov 79ea471098 Merge branch 'develop' into refactoring/scope 
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Core.Common/BaseCommonLinkUtility.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Migration/Program.cs
#	common/services/ASC.Notify/NotifyServiceLauncher.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Socket.IO.Svc/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Thumbnails.Svc/Program.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-11-04 15:22:43 +03:00
..
Properties Encryption: fix port 2020-09-18 21:15:50 +03:00
appsettings.json Encryption: first version 2020-09-02 13:54:50 +03:00
ASC.Data.Storage.Encryption.csproj References updated 2020-10-16 10:27:44 +03:00
EncryptionOperation.cs Scope: refactoring. Encryption 2020-10-26 17:23:23 +03:00
EncryptionServiceLauncher.cs Scope: refactoring 2020-10-19 18:53:15 +03:00
EncryptionServiceListener.cs Scope: refactoring 2020-10-19 18:53:15 +03:00
EncryptionWorker.cs Refactoring: scope 2020-10-22 20:57:18 +03:00
NotifyHelper.cs Scope: refactoring 2020-10-19 18:53:15 +03:00
Program.cs Autofac: fix 2020-11-02 19:27:08 +03:00
Startup.cs Merge branch 'develop' into refactoring/scope 2020-11-04 15:22:43 +03:00