IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44ec45ebb6
DocSpace-buildtools/common/ASC.Common
History
pavelbannov 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
..
Caching Added DIHelper 2020-02-17 11:58:14 +03:00
Collections Optimization 2019-08-30 15:40:57 +03:00
Data EF: removed old classes 2019-12-23 17:57:21 +03:00
DependencyInjection Files: ef, di 2020-02-19 11:37:52 +03:00
Geolocation EF: GeolocationHelper 2019-12-13 16:05:24 +03:00
Logging Merge branch 'master' into feature/elastic 2020-02-25 11:24:45 +03:00
Module init commit 2019-05-15 17:56:09 +03:00
Notify Optimization 2019-08-08 12:26:58 +03:00
Properties Code Cleanup 2019-08-15 15:04:42 +03:00
protos renamed InstanseId -> InstanceId, BaseCommonLinkUtilityFactory -> BaseCommonLinkUtilityExtension 2019-11-11 14:22:11 +03:00
Security Removed unused dependencies 2020-02-20 17:57:48 +03:00
Tests EF: removed old classes 2019-12-23 17:57:21 +03:00
Threading Files: DI 2020-02-07 14:34:25 +03:00
Utils Added DIHelper 2020-02-17 11:58:14 +03:00
Web Removed HttpContext.Current, DbManagerProxy 2019-10-21 17:44:14 +03:00
ASC.Common.csproj updated dependecies 2020-02-21 11:13:01 +03:00
ASC.Common.sln init commit 2019-05-15 17:56:09 +03:00
DIHelper.cs DIHelper: fixed configure method 2020-02-17 15:13:40 +03:00