Commit Graph

80 Commits

Author SHA1 Message Date
91fd7615b3 Optimization 2021-08-20 10:52:52 +03:00
d88741962c EF: optimize server version check 2021-07-16 11:48:30 +03:00
f222f4be0c .net 5 2021-01-22 16:42:26 +03:00
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
62cd0a6af0 Test: fix test migrate, drop test db 2020-12-25 13:48:04 +03:00
Diana
589c17ac95 fix 2020-12-22 02:27:10 +03:00
1675896294 Merge branch 'develop' into feature/dotnet5
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
2020-12-04 11:59:10 +03:00
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
1623241d8a Code cleanup 2020-11-17 13:00:01 +03:00
d2a0d318f7 dotnet 5 2020-11-17 12:59:15 +03:00
3256a3dbc7 DI: fix 2020-10-28 23:02:03 +03:00
bff9629389 Scope: refactoring 2020-10-20 16:24:46 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
9fe6fc3832 Refactoring: scope 2020-10-19 10:19:32 +03:00
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +03:00
4a0a683c68 fix 2020-10-14 12:11:04 +03:00
f252ef2a7f Merge branch 'master' into features/ASC.AuditTrail
# Conflicts:
#	ASC.Web.sln
2020-10-13 18:17:59 +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
49a7e215d2 added editorconfig 2020-10-09 18:52:17 +03:00
e01ee037f2 Merge branch 'master' into feature/fix-messages
# Conflicts:
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Core.Common/EF/Context/CoreDbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContextManager.cs
#	common/ASC.Core.Common/EF/Context/FeedDbContext.cs
#	common/ASC.Core.Common/EF/Context/FilesDbContext.cs
#	common/ASC.Core.Common/EF/Context/MessagesContext.cs
#	common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
#	common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
#	common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
#	common/ASC.Core.Common/EF/Model/AccountLinks.cs
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
#	common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
#	common/ASC.Core.Common/EF/Model/Core/Subscription.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
#	common/ASC.Core.Common/EF/Model/FilesConverts.cs
#	common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
#	common/ASC.Core.Common/EF/Model/TelegramUser.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
#	common/ASC.Core.Common/EF/Model/User/UserGroup.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
#	products/ASC.Files/Core/Core/EF/DbFile.cs
#	products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
#	products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
#	products/ASC.Files/Core/Core/EF/DbFolderTree.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-10-09 15:40:44 +03:00
bc1438ba92 EF: rename 2020-10-08 12:07:05 +03:00
b9e74c0e4d DbContextManager: fix 2020-10-08 11:56:46 +03:00
573dc8922b Merge branch 'master' into feature/schema
# Conflicts:
#	common/ASC.Common/DIHelper.cs
2020-10-08 11:42:57 +03:00
Diana
2ceb82b458 flag to turn on/off migrations 2020-10-07 15:20:06 +03:00
Diana
cc8b3e470d fix 2020-10-06 14:38:15 +03:00
SuhorukovAnton
8fb13f633c ASC.AuditTrail 2020-10-06 14:24:12 +03:00
1ba65b9c01 EF: new Migration scheme 2020-10-06 10:06:18 +03:00
SuhorukovAnton
d145bcf076 ASC.AuditTrail: first version 2020-10-06 10:06:05 +03:00
191b517a59 Ef: fix 2020-10-05 13:11:15 +03:00
9c6812a9c3 EF: refactoring 2020-10-05 13:02:28 +03:00
bfba82be8e EF: refactoring data 2020-10-05 12:56:07 +03:00
9b5f32be30 Merge branch 'feature/schema' of github.com:ONLYOFFICE/AppServer into feature/schema 2020-10-05 12:27:33 +03:00
07263e58e8 EF: removed partial
Files: removed DbEncryptedData.cs
2020-10-05 12:27:15 +03:00
Diana
04ee542f22 fix migrations, models, added migration and model schema TelegramDbContext 2020-10-01 20:08:55 +03:00
6bad98e277 Merge branch 'master' into feature/schema
# Conflicts:
#	config/appsettings.json
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.Studio/ASC.Web.Studio.csproj
2020-10-01 12:25:07 +03:00
0bd5099c00 Removed Migrations() 2020-10-01 11:39:21 +03:00
SuhorukovAnton
ba1ed22345 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
Diana
0d74f8d6a2 fix 2020-09-29 20:13:09 +03:00
Diana
4a5e577cd4 Added Data 2020-09-18 20:50:30 +03:00
dd80e300d0 Common, Core.Common moved from release/11 4414f77b 2020-09-15 16:11:05 +03:00
Diana
32241a70a6 changed 2020-09-07 01:49:03 +03:00
Diana
463a73e22c changed 2020-09-06 21:47:52 +03:00
Diana
9f1cf2f8df changes 2020-09-05 22:18:29 +03:00
aa62721e73 EF: refactoring 2020-09-02 18:23:39 +03:00
Diana
7466aed406 choice between mysql and postgresql 2020-08-28 00:45:07 +03:00
Diana
bb5c2a23e7 postgree 2020-08-21 05:34:37 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00