Commit Graph

14 Commits

Author SHA1 Message Date
f8be896241 Merge branch 'develop' into feature/dotnet5
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2021-01-22 16:34:40 +03:00
Diana
aa667a02ef fix 2020-12-24 03:21:29 +03:00
Diana
589c17ac95 fix 2020-12-22 02:27:10 +03:00
eb6b54482e fix warnings 2020-11-17 13:47:17 +03:00
bc1438ba92 EF: rename 2020-10-08 12:07:05 +03:00
bfba82be8e EF: refactoring data 2020-10-05 12:56:07 +03:00
Diana
bea6857429 fix models for npgsql 2020-09-29 20:09:39 +03:00
dbbd0010f3 EF: fix 2020-09-20 23:02:34 +03:00
Diana
4a5e577cd4 Added Data 2020-09-18 20:50:30 +03:00
aa62721e73 EF: refactoring 2020-09-02 18:23:39 +03:00
Diana
bb5c2a23e7 postgree 2020-08-21 05:34:37 +03:00
30d952b946 fix 2020-02-21 15:38:04 +03:00
f696558445 EF: AddOrUpdate 2019-12-17 16:01:59 +03:00
b3c64af077 EF: files renamed 2019-12-12 18:33:48 +03:00