pavelbannov
44ec45ebb6
# 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 |
||
---|---|---|
.. | ||
Calendars | ||
Extensions | ||
Files | ||
Helpers | ||
Jabber | ||
Mobile | ||
ModuleManagement | ||
Notify | ||
Properties | ||
protos | ||
PublicResources | ||
Security | ||
Sms | ||
Statistic | ||
Subscriptions | ||
Tfa | ||
Users | ||
Utility | ||
WebZones | ||
WhiteLabel | ||
AddonContext.cs | ||
ASC.Web.Core.csproj | ||
AuthService.cs | ||
CollaboratorSettings.cs | ||
CommonPhotoManager.cs | ||
CookiesManager.cs | ||
CustomNavigationSettings.cs | ||
EmailActivationSettings.cs | ||
FileSizeComment.cs | ||
IAddon.cs | ||
IModule.cs | ||
IProduct.cs | ||
IWebItem.cs | ||
LoginProfileExtension.cs | ||
LogoUploader.cs | ||
ModuleContext.cs | ||
NavigationWebItem.cs | ||
PersonalSettings.cs | ||
Product.cs | ||
ProductContext.cs | ||
PromotionsSettings.cs | ||
QuotaSync.cs | ||
SecutiryConstants.cs | ||
SetupInfo.cs | ||
SpaceUsageStatManager.cs | ||
StudioDefaultPageSettings.cs | ||
TariffSettings.cs | ||
TipsSettings.cs | ||
WebItemContext.cs | ||
WebItemManager.cs | ||
WebItemSecurity.cs | ||
WebItemSecurityInfo.cs |