Commit Graph

46 Commits

Author SHA1 Message Date
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
43b9c33979 fix formating 2020-10-12 19:23:15 +03:00
36034bf97a fix warnings 2020-10-12 16:52:31 +03:00
SuhorukovAnton
917493f397 fix-messages: IDE0058 2020-10-10 14:35:05 +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
e8061d10bd DI: refactoring 2020-10-08 11:36:47 +03:00
SuhorukovAnton
ba1ed22345 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
SuhorukovAnton
4e1bc262b9 fix-messages: IDE0075 2020-09-29 14:53:02 +03:00
SuhorukovAnton
a055c71610 fix-messages: IDE0070 2020-09-29 14:32:30 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
c5ff09ac09 Added DI for Voip 2020-04-17 17:07:44 +03:00
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00
a8f8b63414 EF: removed old classes 2019-12-23 17:57:21 +03:00
2782d9f64c Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	common/ASC.VoipService/Dao/VoipDao.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
db5f113480 EF: Mail 2019-12-13 14:37:58 +03:00
a47196dc05 EF: Voip 2019-12-11 17:30:28 +03:00
44d6e6e53d Dependencies updated 2019-11-12 13:28:30 +03:00
53d2aaa4e3 DI: DbManager 2019-10-21 16:50:20 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
5ec41ccaff DI: removed appSettings 2019-10-14 11:23:45 +03:00
2ebe431c98 DI: configuration 2019-10-10 11:52:21 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
1e946b19b6 DI: refactoring 2019-09-20 18:53:27 +03:00
e13049c21f DI: CommonLinkUtility 2019-09-19 18:55:44 +03:00
c171e2c903 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	common/ASC.IPSecurity/ASC.IPSecurity.csproj
#	common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
#	common/ASC.VoipService/ASC.VoipService.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/ASC.Web.Core.csproj
#	web/ASC.Web.Studio/ASC.Web.Studio.csproj
2019-09-18 13:32:39 +03:00
152c5d9697 .net core up to 3.0.0-rc1 2019-09-18 12:29:17 +03:00
4e2c04c9f7 DI: TenantManager 2019-09-17 15:42:32 +03:00
e0cb81adc4 Merge branch 'master' into refactoring/di
# Conflicts:
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-11 21:21:21 +03:00
c50b5b0fc9 csproj: remove pdb file from release build configuration 2019-09-10 16:38:20 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00
28fc76ded9 IDE0066 2019-08-15 18:13:25 +03:00
9e32ad4b6c IDE0063 2019-08-15 18:08:40 +03:00
3cd4131f21 IDE0039, IDE0041, IDE0044 2019-08-15 17:36:08 +03:00
3636df7a24 IDE0031 2019-08-15 16:28:29 +03:00
ed7ed484e8 IDE0049 2019-08-15 16:16:39 +03:00
d9be7211f6 IDE0018 2019-08-15 16:05:50 +03:00
f8f2c94962 IDE0034 2019-08-15 16:00:20 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
d524663958 Packages updated 2019-08-12 15:52:09 +03:00
49b259abff refactoring 2019-08-09 15:28:19 +03:00
f85711b736 Optimization 2019-08-08 12:26:58 +03:00
cb5f732e76 Replaced ICacheNotify with ICacheNotify<>
Removed RedisCache
2019-07-22 15:31:09 +03:00
4021ce350c added ASC.VoipService 2019-06-06 17:41:16 +03:00