pavelbannov 570ede7bba Merge branch 'develop' into feature/11.5.2 ... # Conflicts: # common/ASC.Data.Storage/StorageUploader.cs # common/services/ASC.Data.Backup/Service/BackupWorker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2021-05-31 13:32:51 +03:00
..
Calendars	WebStudio: moved from 08a01422	2021-05-27 20:13:24 +03:00
Extensions	revert discard	2020-10-12 22:39:23 +03:00
Files	ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422	2021-05-24 13:26:13 +03:00
Helpers	Code cleanup	2020-11-17 13:00:01 +03:00
Jabber	Settings: added authproviders and login.ashx	2020-07-28 11:13:49 +03:00
Mail	Files: removed temp	2021-01-13 12:41:29 +03:00
Mobile	MemoryCache -> IMemoryCache	2021-01-12 20:51:14 +03:00
ModuleManagement	fix	2020-08-27 17:01:37 +03:00
Notify	Files: moved from 08a01422	2021-05-28 11:22:35 +03:00
protos	Removed TenantProvider	2019-09-16 17:51:39 +03:00
PublicResources	WebStudio: resources	2021-05-27 21:30:15 +03:00
Security	fix	2020-08-27 17:01:37 +03:00
Sms	Files: removed temp	2021-01-13 12:41:29 +03:00
Statistic	Scope: refactoring	2020-10-19 18:53:15 +03:00
Subscriptions	fix	2020-08-27 17:01:37 +03:00
Tfa	Web.Core: moved from 08a01422	2021-05-24 20:41:31 +03:00
Users	Merge branch 'develop' into feature/11.5.2	2021-05-31 13:32:51 +03:00
Utility	WebStudio: moved from 08a01422	2021-05-27 20:13:24 +03:00
WebZones	Added ASC.Web.Core	2019-06-07 11:59:07 +03:00
WhiteLabel	Web.Core: moved from 08a01422	2021-05-24 20:41:31 +03:00
AddonContext.cs	Added ASC.Web.Core	2019-06-07 11:59:07 +03:00
ASC.Web.Core.csproj	from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects	2021-04-30 18:42:10 +03:00
AuthService.cs	fix warnings	2020-10-12 16:52:31 +03:00
CollaboratorSettings.cs	Fix License	2020-07-08 18:30:23 +03:00
CommonPhotoManager.cs	Removed sq bugs and code smells	2020-10-16 16:21:59 +03:00
CookiesManager.cs	ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422	2021-05-24 13:26:13 +03:00
CustomNavigationSettings.cs	Fix License	2020-07-08 18:30:23 +03:00
EmailActivationSettings.cs	Fix License	2020-07-08 18:30:23 +03:00
FileSizeComment.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
IAddon.cs	Added ASC.Web.Core	2019-06-07 11:59:07 +03:00
IModule.cs	fix	2020-08-27 17:01:37 +03:00
IProduct.cs	fix	2020-08-27 17:01:37 +03:00
IWebItem.cs	People as external product	2019-07-05 16:58:04 +03:00
LoginProfileExtension.cs	Files: GoogleDriveApp	2020-02-03 16:31:42 +03:00
LogoUploader.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
ModuleContext.cs	Added ASC.Web.Core	2019-06-07 11:59:07 +03:00
NavigationWebItem.cs	fix	2020-08-27 17:01:37 +03:00
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	Api: modules. Added info method	2021-01-25 17:37:26 +03:00
ProductContext.cs	Api: get modules via WebItemManager	2019-06-10 15:17:45 +03:00
PromotionsSettings.cs	Fix License	2020-07-08 18:30:23 +03:00
QuotaSync.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
SecutiryConstants.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
SetupInfo.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
SpaceUsageStatManager.cs	Code Cleanup	2019-08-15 15:04:42 +03:00
StudioAdminMessageSettings.cs	Api: added SaveMailDomainSettings, EnableAdminMessageSettings	2020-07-22 14:03:38 +03:00
StudioDefaultPageSettings.cs	Fix License	2020-07-08 18:30:23 +03:00
StudioTrustedDomainSettings.cs	Api: added SaveMailDomainSettings, EnableAdminMessageSettings	2020-07-22 14:03:38 +03:00
TariffSettings.cs	revert discard	2020-10-12 22:39:23 +03:00
TipsSettings.cs	fix	2020-08-27 17:01:37 +03:00
WebItemContext.cs	fix	2020-08-27 17:01:37 +03:00
WebItemManager.cs	Fixed loading products, lazy loading webitemmanager	2021-01-26 12:29:50 +03:00
WebItemSecurity.cs	WebStudio: moved from 08a01422	2021-05-27 20:13:24 +03:00
WebItemSecurityInfo.cs	fix	2020-08-27 17:01:37 +03:00