Commit Graph

15 Commits

Author SHA1 Message Date
44250c4f2f fix 2023-02-22 17:39:33 +03:00
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
f762b44dbe update external dll 2023-01-19 19:10:38 +03:00
4ddf7d521c update external dependency 2023-01-19 19:05:07 +03:00
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
14d07500b2 fix 2022-12-20 12:34:39 +03:00
d31e341ff9 add async and AddBaseDbContext with settings 2022-12-20 10:27:55 +03:00
d1c436ea11 add migration to Teamlabsite 2022-12-19 18:01:57 +03:00
ce773b76bd rename appsettings in migration.sln 2022-12-07 17:28:40 +03:00
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
bc738ab5ea fix 2022-09-12 19:41:16 +03:00
46caff0b0c Push: post merge fixes 2022-08-15 01:00:11 +03:00
9d69882cf3 removed BaseDbContext 2022-07-29 15:53:29 +03:00
33769036d5 fix 2022-07-26 14:53:36 +03:00
3d22992b7d Migrations: rename 2022-07-26 14:52:53 +03:00