Vashchuk Nikita 5aa99ec811 Merge branch 'develop' into feature/async ... # Conflicts: # common/ASC.Common/Caching/KafkaCache.cs # common/ASC.Data.Backup.Core/Storage/BackupRepository.cs # common/services/ASC.AuditTrail/AuditEventsRepository.cs # common/services/ASC.AuditTrail/LoginEventsRepository.cs # products/ASC.Files/Core/ASC.Files.Core.csproj # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs # products/ASC.Files/Core/Utils/MailMergeTask.cs # products/ASC.Files/Server/ASC.Files.csproj # products/ASC.Files/Service/Thumbnail/FileDataProvider.cs		2022-02-04 16:04:52 +03:00
..
Contracts	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Core	async IDataStore	2022-01-25 12:29:11 +03:00
EF	used one dbcontext per service (per DAO). fixed error: System.InvalidOperationException: 'Cannot use multiple context instances within a single query execution. Ensure the query uses a single context instance.'	2022-01-21 16:45:50 +03:00
Exceptions	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Extensions	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
protos	refactoring *.proto files according to https://bit.ly/3KcZ0Ef	2022-01-11 19:28:48 +03:00
Service	backup: refactoring	2022-01-18 19:04:35 +03:00
Storage	Merge branch 'develop' into feature/async	2022-02-04 16:04:52 +03:00
Tasks	async IDataStore	2022-01-25 12:29:11 +03:00
Utils	Merge branch 'develop' into feature/net6	2021-10-22 16:10:37 +03:00
ActionInvoker.cs	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
ASC.Data.Backup.Core.csproj	Packages updated	2022-02-02 19:54:23 +03:00
BackupAjaxHandler.cs	backup: refactoring	2022-01-18 19:04:35 +03:00
BackupFileUploadHandler.cs	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
BackupResource.Designer.cs	Merge branch 'develop' into feature/backup.core	2021-09-05 12:50:05 +03:00
BackupResource.resx	backup.core: move backup.core	2021-09-02 15:41:54 +03:00