Commit Graph

42 Commits

Author SHA1 Message Date
5eed00dd28 Removed sq bugs and code smells 2020-10-16 16:21: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
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
SuhorukovAnton
ba1ed22345 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
Diana
3668e4932a choise between mysql and postgresql 2020-08-28 00:52:23 +03:00
c325cb139d Settings: added authproviders and login.ashx 2020-07-28 11:13:49 +03:00
e10ac2ccfa BaseStartup: refactoring 2020-07-15 15:33:44 +03:00
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +03:00
SuhorukovAnton
00558dd95f general-startup: fix 2020-07-06 10:56:17 +03:00
b569245076 rever logger 2020-06-04 16:47:27 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +03:00
44ec45ebb6 Merge branch 'master' into feature/elastic
# Conflicts:
#	common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Caching/CachedQuotaService.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/AuthManager.cs
#	common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Data/DbSettingsManager.cs
#	common/ASC.Core.Common/Tenants/TenantUtil.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2020-02-25 11:24:45 +03:00
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
a8f8b63414 EF: removed old classes 2019-12-23 17:57:21 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
fcc4e4605f Common nlog config 2019-11-15 11:47:56 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
0be2995e83 DI: filters and handlers 2019-11-01 12:37:02 +03:00
9d08727f4c DI: refactoring. ASC.Web.Studio 2019-10-31 17:50:24 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
726ca634e4 Revert "removed ConfigurationManager"
This reverts commit c03be150f4.

ProgressQueue init
2019-10-22 16:48:48 +03:00
78584b78a3 DI: removed LogManager 2019-10-22 14:21:44 +03:00
337238c87c Removed CommonServiceProvider 2019-10-21 18:05:36 +03:00
74d8709f62 DI: configuration 2019-10-09 19:08:37 +03:00
02efce033f Api: added confirm auth scheme 2019-09-10 15:42:15 +03:00
6c72b154e2 Server: added ForwardedHeaders 2019-07-12 17:28:14 +03:00
01fdf7831b Fix start web.studio 2019-07-09 16:07:44 +03:00
d24a08b16f Moved Studio->ClientApp to separated ASC.Web.Client folder 2019-07-09 14:51:18 +03:00
1ad03ec6d8 Added auth to StorageHandler 2019-07-09 13:29:53 +03:00
73308504b3 Added ability to connect external products 2019-06-26 12:26:36 +03:00
932f4e4e18 Refactoring.
Set User Culture
2019-06-24 11:20:03 +03:00
fcd562514b ASC.Resource.Manager: tool for export resources 2019-06-11 16:32:43 +03:00
b797986c8c Api controllers via autofac 2019-06-10 19:15:34 +03:00
4d440232f2 Storage: DI singleton 2019-06-10 15:54:10 +03:00
531763fa1c Added ASC.Web.Core 2019-06-07 11:59:07 +03:00
aa4155eed7 ASC.FederatedLogin: .netcoreapp3.0 2019-06-06 16:34:46 +03:00
84fe95768a fix HttpContext.Current 2019-06-06 11:44:38 +03:00
9b3506ab0c ASC.Data.Storage: init commit. 2019-06-04 17:43:20 +03:00
a7d14cd42a web: Login init 2019-05-30 10:33:38 +03:00
92ed33906c init commit 2019-05-15 17:56:09 +03:00