DocSpace-buildtools/web/ASC.Web.Core
AlexeySafronov 7f095f03d1 Merge branch 'master' into feature/Wizard
# Conflicts:
#	common/ASC.Resource.Manager/Startup.cs
#	config/kafka.json
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
#	web/ASC.Web.Core/TariffSettings.cs
2020-07-15 15:23:28 +03:00
..
Calendars Fix License 2020-07-08 18:30:23 +03:00
Extensions moved from hotfix/10.5.2 2020-01-22 16:59:49 +03:00
Files Fix License 2020-07-08 18:30:23 +03:00
Helpers Added DIHelper 2020-02-17 11:58:14 +03:00
Jabber Files: fropbox 2020-03-06 16:17:17 +03:00
Mail moved from hotfix/10.5.2 2020-01-22 16:59:49 +03:00
Mobile EF: MobileAppInstall 2019-12-12 18:24:47 +03:00
ModuleManagement Code Cleanup 2019-08-15 15:04:42 +03:00
Notify api-defaultvalue: fix 2020-07-02 23:51:18 +03:00
Properties Added ASC.Web.Core 2019-06-07 11:59:07 +03:00
protos Removed TenantProvider 2019-09-16 17:51:39 +03:00
PublicResources Merge branch 'master' into feature/Wizard 2020-07-15 15:23:28 +03:00
Security Code Cleanup 2019-08-15 15:04:42 +03:00
Sms api-defaultvalue: add JsonPropertyNames 2020-07-09 22:06:08 +03:00
Statistic Added DIHelper 2020-02-17 11:58:14 +03:00
Subscriptions Code Cleanup 2019-08-15 15:04:42 +03:00
Tfa api-defaultvalue: add JsonPropertyNames 2020-07-09 22:06:08 +03:00
Users Fix License 2020-07-08 18:30:23 +03:00
Utility Merge branch 'master' into feature/Wizard 2020-07-15 15:23:28 +03:00
WebZones Added ASC.Web.Core 2019-06-07 11:59:07 +03:00
WhiteLabel api-defaultvalue: add JsonPropertyNames 2020-07-09 22:06:08 +03:00
AddonContext.cs Added ASC.Web.Core 2019-06-07 11:59:07 +03:00
ASC.Web.Core.csproj Resource: fix 2020-07-15 12:55:31 +03:00
AuthService.cs Api: added settings controller 2019-08-12 13:53:12 +03:00
CollaboratorSettings.cs Fix License 2020-07-08 18:30:23 +03:00
CommonPhotoManager.cs IDE0063 2019-08-15 18:08:40 +03:00
CookiesManager.cs Merge branch 'master' into feature/elastic 2020-02-25 11:24:45 +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 Added DIHelper 2020-02-17 11:58:14 +03:00
IAddon.cs Added ASC.Web.Core 2019-06-07 11:59:07 +03:00
IModule.cs Added ASC.Web.Core 2019-06-07 11:59:07 +03:00
IProduct.cs Api controllers via autofac 2019-06-10 19:15:34 +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 Added DIHelper 2020-02-17 11:58:14 +03:00
ModuleContext.cs Added ASC.Web.Core 2019-06-07 11:59:07 +03:00
NavigationWebItem.cs IDE0019, IDE0020 2019-08-15 16:41:38 +03:00
PersonalSettings.cs api-defaultvalue: add JsonPropertyNames 2020-07-09 22:06:08 +03:00
Product.cs DI: configuration 2019-09-23 15:20:08 +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 fixed scope 2019-11-15 12:28:20 +03:00
SecutiryConstants.cs Api: added settings controller 2019-08-12 13:53:12 +03:00
SetupInfo.cs Backup: fix 2020-06-28 14:46:16 +03:00
SpaceUsageStatManager.cs Code Cleanup 2019-08-15 15:04:42 +03:00
StudioDefaultPageSettings.cs Fix License 2020-07-08 18:30:23 +03:00
TariffSettings.cs Merge branch 'master' into feature/Wizard 2020-07-15 15:23:28 +03:00
TipsSettings.cs api-defaultvalue: delete DataContracts 2020-07-08 13:10:09 +03:00
WebItemContext.cs Code Cleanup 2019-08-15 15:04:42 +03:00
WebItemManager.cs Files: search 2020-04-29 17:11:31 +03:00
WebItemSecurity.cs Added DIHelper 2020-02-17 11:58:14 +03:00
WebItemSecurityInfo.cs Added ASC.Web.Core 2019-06-07 11:59:07 +03:00