Commit Graph

18 Commits

Author SHA1 Message Date
ced642832e fix merge 2023-04-06 18:18:00 +03:00
07d847fdd1 Merge branch 'develop' into feature/optimization-ef 2023-04-06 17:24:05 +03:00
63ee0ca117 UserDbContext - async 2023-03-24 10:53:49 +03:00
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
405ed839bb CoreDbContext -async 2023-03-14 23:44:44 +03:00
2e21ee42d5 Merge branch 'develop' into refactoring/generic-classes 2023-02-08 19:54:31 +03:00
84326ae51d refactoring 2022-12-26 10:23:18 +03:00
14d47ee49d refactoring 2022-12-22 16:16:31 +03:00
b693486b46 merge from develop 2022-12-01 14:52:46 +03:00
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
789ab8f956 Merge branch 'develop' into feature/refactoring-saveUserInfo
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Core/FilesModule.cs
#	products/ASC.Files/Service/Core/FoldersModule.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-11-09 12:57:16 +03:00
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00
deb0c5beb7 remove .wait and .result 2022-10-27 13:49:42 +03:00
92ef73eb86 async UpdateUserInfo and SaveUserInfo 2022-10-25 18:27:56 +03:00
9faa6a947a Files: refactor 2022-09-19 11:50:31 +03:00
8ea04bcc81 Merge branch 'develop' into feature/12.0
# Conflicts:
#	common/ASC.MessagingSystem/Data/MessagesRepository.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
2022-06-17 19:19:00 +03:00
c9fb0d3dac moved from ddf515b8 2022-06-16 11:13:53 +03:00
8c56de7a26 moved from ddf515b8 2022-06-05 18:44:37 +03:00