IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5613f55ea6
DocSpace-client/web/ASC.Web.Core
History
pavelbannov 26947072c6 Merge branch 'feature/backend-refactor' into feature/warnings 
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskProgress.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Core.Common/Configuration/AmiPublicDnsSyncService.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyRequest.cs
#	common/ASC.Core.Common/Notify/Model/NotifyClientImpl.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	products/ASC.Files/Core/ApiModels/ResponseDto/FileDto.cs
#	products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	web/ASC.Web.Core/CollaboratorSettings.cs
#	web/ASC.Web.Core/CustomNavigationSettings.cs
#	web/ASC.Web.Core/EmailActivationSettings.cs
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
#	web/ASC.Web.Core/Notify/SpamEmailSettings.cs
#	web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
#	web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
#	web/ASC.Web.Core/PersonalSettings.cs
#	web/ASC.Web.Core/PrivacyRoomSettings.cs
#	web/ASC.Web.Core/PromotionsSettings.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Sms/SmsSender.cs
#	web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
#	web/ASC.Web.Core/StudioAdminMessageSettings.cs
#	web/ASC.Web.Core/StudioDefaultPageSettings.cs
#	web/ASC.Web.Core/StudioTrustedDomainSettings.cs
#	web/ASC.Web.Core/TariffSettings.cs
#	web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs
#	web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs
#	web/ASC.Web.Core/TipsSettings.cs
#	web/ASC.Web.Core/Users/CustomNamingPeople.cs
#	web/ASC.Web.Core/Users/UserHelpTourSettings.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs
#	web/ASC.Web.Core/Utility/ColorThemesSettings.cs
#	web/ASC.Web.Core/Utility/PasswordSettings.cs
#	web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs
#	web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs
#	web/ASC.Web.Core/Utility/Settings/WizardSettings.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
#	web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
#	web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs
#	web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-04-14 15:21:06 +03:00
..
Calendars Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Extensions Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Files IDE1006 2022-03-25 19:26:06 +03:00
Helpers refactor 2022-03-22 13:31:41 +03:00
Jabber Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Mail IDE1006 2022-03-25 19:26:06 +03:00
Mobile Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
ModuleManagement Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Notify Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
protos refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
PublicResources fix Bug 52493 - Welcome page. notify «User with this email is already registered» 2021-11-30 12:09:51 +03:00
Security Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Sms Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
Statistic Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Subscriptions Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Tfa Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
Users Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
Utility Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
WebZones Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
WhiteLabel Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
AddonContext.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
ASC.Web.Core.csproj fix 2022-03-21 16:16:55 +03:00
AuthService.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
CollaboratorSettings.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
CommonPhotoManager.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
CookiesManager.cs IDE1006 2022-03-25 19:26:06 +03:00
CustomNavigationSettings.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
EmailActivationSettings.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
FileSizeComment.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
GlobalUsings.cs added new license headers 2022-03-15 21:00:53 +03:00
IAddon.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
IModule.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
IProduct.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
IWebItem.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
LoginProfileExtension.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
LogoUploader.cs IDE1006 2022-03-25 19:26:06 +03:00
ModuleContext.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
NavigationWebItem.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
PersonalSettings.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
PrivacyRoomSettings.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
Product.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
ProductContext.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
PromotionsSettings.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
QuotaSync.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
Recaptcha.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
SecutiryConstants.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
SetupInfo.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
SpaceUsageStatManager.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
StudioAdminMessageSettings.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
StudioDefaultPageSettings.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
StudioTrustedDomainSettings.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
TariffSettings.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
TipsSettings.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
WebItemContext.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
WebItemManager.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
WebItemSecurity.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
WebItemSecurityInfo.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00