pavelbannov 35e22fe8c8 Merge branch 'develop' into feature/fix-whitelable ... # Conflicts: # web/ASC.Web.Api/Api/Settings/WhitelabelController.cs # web/ASC.Web.Core/LogoUploader.cs # web/ASC.Web.Core/PublicResources/Resource.resx # web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs		2022-11-18 16:48:19 +03:00
..
Extensions
Files
Helpers
HttpHandlers	Merge branch 'develop' into feature/refactoring-saveUserInfo	2022-11-02 11:16:29 +03:00
Jabber
Log	fix whitelabel	2022-11-15 14:11:44 +03:00
Mobile
ModuleManagement/Common
Notify	dark whitelabel	2022-11-09 16:30:56 +03:00
protos
PublicResources	Merge branch 'develop' into feature/fix-whitelable	2022-11-18 16:48:19 +03:00
Quota	Merge branch 'develop' into feature/rights-rework	2022-10-19 15:31:14 +03:00
Sms	Merge branch 'develop' into feature/refactoring-saveUserInfo	2022-11-02 11:16:29 +03:00
Statistic
Subscriptions
Tfa	refactoring	2022-10-10 14:55:22 +03:00
Users	Merge branch 'develop' into feature/fix-whitelable	2022-11-18 16:48:19 +03:00
Utility	Merge branch 'develop' into feature/fix-whitelable	2022-11-18 16:48:19 +03:00
WebZones
WhiteLabel	Merge branch 'develop' into feature/fix-whitelable	2022-11-18 16:48:19 +03:00
AddonContext.cs
ASC.Web.Core.csproj
AuthService.cs
BruteForceLoginManager.cs	optimization	2022-10-09 19:35:59 +03:00
CollaboratorSettings.cs
CommonPhotoManager.cs
CookiesManager.cs
CustomNavigationSettings.cs
EmailActivationSettings.cs
FileSizeComment.cs
GlobalUsings.cs	Merge branch 'develop' into feature/stripe	2022-10-10 19:16:03 +03:00
IAddon.cs
IModule.cs
IProduct.cs
IWebItem.cs
LoginProfileExtension.cs
LogoUploader.cs	fix whitelabel	2022-11-15 14:11:44 +03:00
ModuleContext.cs
PersonalSettings.cs
PrivacyRoomSettings.cs
Product.cs
ProductContext.cs
PromotionsSettings.cs
QuotaSync.cs	Merge branch 'develop' into feature/remove-waste	2022-11-07 11:25:54 +03:00
Recaptcha.cs
SecutiryConstants.cs
SetupInfo.cs	Merge branch 'develop' into feature/stripe	2022-10-10 19:16:03 +03:00
SpaceUsageStatManager.cs	Quota: fix	2022-10-24 17:26:29 +03:00
SsoSettingsV2.cs
SsoUserData.cs
StorageHelper.cs	Merge branch 'develop' into feature/fix-whitelable	2022-11-18 16:48:19 +03:00
StudioAdminMessageSettings.cs
StudioDefaultPageSettings.cs
StudioTrustedDomainSettings.cs	refactor	2022-10-18 14:22:02 +03:00
TariffSettings.cs
TipsSettings.cs
WebItemContext.cs
WebItemManager.cs
WebItemSecurity.cs	Merge branch 'develop' into feature/refactoring-saveUserInfo	2022-11-02 11:16:29 +03:00
WebItemSecurityInfo.cs