pavelbannov 18a2c0a53d Merge branch 'develop' into feature/dotnet5 ... # Conflicts: # common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs # common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs # common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs # common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs # common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs # common/ASC.Core.Common/EF/Model/DbipLocation.cs # common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs # common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs # common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs # common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs # common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs # common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs # common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs # common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs # common/ASC.Core.Common/EF/Model/Resource/ResData.cs # common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs # common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs # common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs # common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs # common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs # common/ASC.Core.Common/EF/Model/User/UserPhoto.cs # common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs # common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs # common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs # common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs # common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs # common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs # products/ASC.Files/Core/Core/EF/DbFilesTag.cs # products/ASC.Files/Core/Core/EF/FilesDbContext.cs		2021-03-25 21:50:09 +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	Merge branch 'develop' into feature/dotnet5	2021-01-22 16:34:40 +03:00
EncryptionOperation.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
EncryptionServiceLauncher.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
EncryptionServiceListener.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
EncryptionWorker.cs	Files: removed temp	2021-01-13 12:41:29 +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	Fixed loading products, lazy loading webitemmanager	2021-01-26 12:29:50 +03:00