DocSpace-client/web/ASC.Web.Core
pavelbannov f8be896241 Merge branch 'develop' into feature/dotnet5
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2021-01-22 16:34:40 +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 Code cleanup 2020-11-17 13:00:01 +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 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
Properties
protos Removed TenantProvider 2019-09-16 17:51:39 +03:00
PublicResources moved from 2e37dcd0 2020-12-28 16:22:08 +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 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
Users Code cleanup 2020-11-17 13:00:01 +03:00
Utility Merge branch 'develop' into feature/dotnet5 2021-01-22 16:34:40 +03:00
WebZones
WhiteLabel Files: removed temp 2021-01-13 12:41:29 +03:00
AddonContext.cs
ASC.Web.Core.csproj Merge branch 'develop' into feature/dotnet5 2021-01-22 16:34:40 +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 Scope: refactoring 2020-10-19 18:53:15 +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
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
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 DI: configuration 2019-09-23 15:20:08 +03:00
ProductContext.cs
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 Merge branch 'develop' into refactoring/scope 2020-11-04 15:22:43 +03:00
WebItemSecurity.cs Files: removed temp 2021-01-13 12:41:29 +03:00
WebItemSecurityInfo.cs fix 2020-08-27 17:01:37 +03:00