pavelbannov 68483bc979 Merge branch 'develop' into refactoring/scope ... # Conflicts: # common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Startup.cs		2020-11-13 16:03:17 +03:00
..
Calendars	revert discard	2020-10-12 22:39:23 +03:00
Extensions	revert discard	2020-10-12 22:39:23 +03:00
Files	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
Helpers	Scope: refactoring	2020-10-19 18:53:15 +03:00
Jabber
Mail	revert discard	2020-10-12 22:39:23 +03:00
Mobile	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
ModuleManagement
Notify	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
Properties
protos
PublicResources	Revert "Fix resources"	2020-11-06 16:59:50 +03:00
Security
Sms	DI: fix	2020-10-28 23:02:03 +03:00
Statistic	Scope: refactoring	2020-10-19 18:53:15 +03:00
Subscriptions
Tfa	Scope: refactoring	2020-10-19 18:53:15 +03:00
Users	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
Utility	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
WebZones
WhiteLabel	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
AddonContext.cs
ASC.Web.Core.csproj	References updated	2020-10-16 10:27:44 +03:00
AuthService.cs	fix warnings	2020-10-12 16:52:31 +03:00
CollaboratorSettings.cs
CommonPhotoManager.cs	Removed sq bugs and code smells	2020-10-16 16:21:59 +03:00
CookiesManager.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
CustomNavigationSettings.cs
EmailActivationSettings.cs
FileSizeComment.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
IAddon.cs
IModule.cs
IProduct.cs
IWebItem.cs
LoginProfileExtension.cs
LogoUploader.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
ModuleContext.cs
NavigationWebItem.cs
PersonalSettings.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
PrivacyRoomSettings.cs	fix	2020-10-14 12:11:04 +03:00
Product.cs
ProductContext.cs
PromotionsSettings.cs
QuotaSync.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
SecutiryConstants.cs
SetupInfo.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
SpaceUsageStatManager.cs
StudioAdminMessageSettings.cs
StudioDefaultPageSettings.cs
StudioTrustedDomainSettings.cs
TariffSettings.cs	revert discard	2020-10-12 22:39:23 +03:00
TipsSettings.cs
WebItemContext.cs
WebItemManager.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
WebItemSecurity.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
WebItemSecurityInfo.cs