Commit Graph

18 Commits

Author SHA1 Message Date
31752e64b4 fixed warnings 2021-05-14 15:26:18 +03:00
18a2c0a53d Merge branch 'develop' into feature/dotnet5
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
#	common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
#	common/ASC.Core.Common/EF/Model/DbipLocation.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
#	common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
#	common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResData.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
#	common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
#	common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTag.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
2021-03-25 21:50:09 +03:00
Diana
4ddd2cebec delete dataannotations 2021-02-20 22:02:12 +03:00
eb6b54482e fix warnings 2020-11-17 13:47:17 +03:00
3ca0990715 Merge branch 'master' into feature/files
# Conflicts:
#	common/ASC.Core.Common/EF/Model/FilesConverts.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2020-10-08 19:01:09 +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
04ee542f22 fix migrations, models, added migration and model schema TelegramDbContext 2020-10-01 20:08:55 +03:00
Diana
4a5e577cd4 Added Data 2020-09-18 20:50:30 +03:00
Diana
32241a70a6 changed 2020-09-07 01:49:03 +03:00
Diana
bb5c2a23e7 postgree 2020-08-21 05:34:37 +03:00
30d952b946 fix 2020-02-21 15:38:04 +03:00
2097fcdb32 EF: removed comment 2019-12-23 15:01:48 +03:00
f696558445 EF: AddOrUpdate 2019-12-17 16:01:59 +03:00
a4cfdb173c EF: fix 2019-12-10 18:31:37 +03:00
b349a46649 EF: WebstudioUserVisit 2019-12-06 19:01:12 +03:00
8ad3b1ca1d "DeleteOldEvents" temporary removed 2019-12-06 13:32:10 +03:00
d081c18c76 EF: settings 2019-12-04 12:04:32 +03:00