pavelbannov f52f32a6af Merge branch 'develop' into feature/asc.apicache ... # Conflicts: # common/ASC.Core.Common/EF/Context/BaseDbContext.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs # common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs # common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs # common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs # common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs # common/Tools/ASC.Migration.Creator/Program.cs # common/Tools/ASC.Migration.Runner/Program.cs # common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs # common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs		2023-02-07 17:07:20 +03:00
..
Auth	asc.apicache	2022-12-16 15:41:09 +03:00
Convention	added new license headers	2022-03-15 21:00:53 +03:00
Core	update external dependency	2023-01-19 19:05:07 +03:00
Extensions	Log: disable cloudwatch logging when awsAccessKeyId not specified	2022-12-21 21:22:04 +03:00
Log	refactoring	2022-08-09 19:13:07 +03:00
Middleware	Api: added links field for success response	2023-01-30 16:57:29 +03:00
Model	fixed cache room logo/user photo	2022-12-29 11:31:22 +03:00
Routing	Added AllowSuspendedFilter	2022-10-12 12:29:08 +03:00
Security	Bug 60660	2023-01-19 12:15:14 +03:00
ASC.Api.Core.csproj	merge from release/rc-v1.2.0. fixed problem and update dll	2023-01-19 15:47:09 +03:00
GlobalUsings.cs	asc.apicache	2022-12-16 15:41:09 +03:00