Commit Graph

21 Commits

Author SHA1 Message Date
a5c6ba5dcc Common, db: moved from 08a01422 2021-05-17 14:35:00 +03:00
a0570554dd Fixed migrations 2021-03-26 12:26:57 +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
976b955137 fix data in table core_settings 2021-03-17 14:30:25 +03:00
91105e8cd0 EF: removed old column tariff_key 2021-03-17 12:09:49 +03:00
Diana
73731f23b7 fix 2021-03-16 12:53:06 +03:00
Diana
4e62f6a204 update migrations ef tools v.5.0.3 2021-03-09 20:56:57 +03:00
e11a880956 Core: fix migrations 2021-01-25 15:31:28 +03:00
53c422c2b2 revert 2020-12-30 18:03:21 +03:00
Diana
aa667a02ef fix 2020-12-24 03:21:29 +03:00
Diana
589c17ac95 fix 2020-12-22 02:27:10 +03:00
02f39a9c71 Merge branch 'master' into feature/files
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	web/ASC.Web.Core/Files/FileUtility.cs
2020-10-13 12:52:28 +03:00
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
43b9c33979 fix formating 2020-10-12 19:23:15 +03:00
SuhorukovAnton
917493f397 fix-messages: IDE0058 2020-10-10 14:35:05 +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
Diana
5c2b6debac fix migrations 2020-10-06 14:39:44 +03:00
1ba65b9c01 EF: new Migration scheme 2020-10-06 10:06:18 +03:00
Diana
04ee542f22 fix migrations, models, added migration and model schema TelegramDbContext 2020-10-01 20:08:55 +03:00
0bd5099c00 Removed Migrations() 2020-10-01 11:39:21 +03:00
Diana
0d74f8d6a2 fix 2020-09-29 20:13:09 +03:00