IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ad30ce26ce
DocSpace-client/web/ASC.Web.Core
History
pavelbannov 6925a83060 Merge branch 'develop' into feature/backend-refactor 
# Conflicts:
#	common/ASC.Common/Caching/ICacheNotify.cs
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Common/Caching/MemoryCacheNotify.cs
#	common/ASC.Common/Threading/DistributedTaskProgress.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/BaseStorage.cs
#	common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSessionHolder.cs
#	common/ASC.Data.Storage/CrossModuleTransferUtility.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
#	common/ASC.Data.Storage/Extensions.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/IDataStore.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Data.Storage/S3/S3UploadGuard.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/ASC.Data.Storage/WebPath.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	common/services/ASC.AuditTrail/AuditEventsRepository.cs
#	common/services/ASC.AuditTrail/AuditReportCreator.cs
#	common/services/ASC.AuditTrail/LoginEventsRepository.cs
#	products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/ILinkDao.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IProviderInfo.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/ITagDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/Entries/ChunkedUploadSession.cs
#	products/ASC.Files/Core/Core/Entries/EncryptionKeyPair.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/FilesIntegration.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Security/IFileSecurity.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/RegexDaoSelectorBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxProviderInfo.cs
#	products/ASC.Files/Core/Helpers/DocuSignHelper.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Helpers/PathProvider.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
#	products/ASC.Files/Core/Model/FileEntryWrapper.cs
#	products/ASC.Files/Core/Model/FileOperationWraper.cs
#	products/ASC.Files/Core/Model/FileWrapper.cs
#	products/ASC.Files/Core/Model/FolderContentWrapper.cs
#	products/ASC.Files/Core/Model/FolderWrapper.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
#	products/ASC.Files/Core/Utils/ChunkedUploadSessionHolder.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileShareLink.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/AuthenticationController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/BuildVersion.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
#	web/ASC.Web.Core/Files/DocumentServiceLicense.cs
#	web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
#	web/ASC.Web.Core/Recaptcha.cs
#	web/ASC.Web.Core/Sms/SmsManager.cs
#	web/ASC.Web.Core/Sms/SmsProvider.cs
#	web/ASC.Web.Core/Sms/SmsSender.cs
#	web/ASC.Web.Core/SpaceUsageStatManager.cs
#	web/ASC.Web.Core/Utility/UrlShortener.cs
2022-02-23 22:42:34 +03:00
..
Calendars Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Extensions Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Files Merge branch 'develop' into feature/backend-refactor 2022-02-23 22:42:34 +03:00
Helpers Merge branch 'develop' into feature/backend-refactor 2022-02-23 22:42:34 +03:00
Jabber Common: return IEventBust to ICacheNotify 2022-02-14 12:05:05 +03:00
Mail Common: return IEventBust to ICacheNotify 2022-02-14 12:05:05 +03:00
Mobile Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
ModuleManagement refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
Notify Merge branch 'develop' into feature/backend-refactor 2022-02-23 22:42:34 +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 refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
Sms Merge branch 'develop' into feature/backend-refactor 2022-02-23 22:42:34 +03:00
Statistic refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
Subscriptions Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Tfa Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Users Merge branch 'develop' into feature/backend-refactor 2022-02-23 22:42:34 +03:00
Utility Merge branch 'develop' into feature/backend-refactor 2022-02-23 22:42:34 +03:00
WebZones refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
WhiteLabel Merge branch 'develop' into feature/backend-refactor 2022-02-23 22:42:34 +03:00
AddonContext.cs Added ASC.Web.Core 2019-06-07 11:59:07 +03:00
ASC.Web.Core.csproj Packages updated 2022-02-02 19:54:23 +03:00
AuthService.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
CollaboratorSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
CommonPhotoManager.cs Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
CookiesManager.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
CustomNavigationSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
EmailActivationSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
FileSizeComment.cs Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
GlobalUsings.cs Merge branch 'develop' into feature/backend-refactor 2022-02-23 22:42:34 +03:00
IAddon.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
IModule.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
IProduct.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
IWebItem.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
LoginProfileExtension.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
LogoUploader.cs Merge branch 'develop' into feature/backend-refactor 2022-02-23 22:42:34 +03:00
ModuleContext.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
NavigationWebItem.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
PersonalSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
PrivacyRoomSettings.cs Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Product.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
ProductContext.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
PromotionsSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
QuotaSync.cs Merge branch 'develop' into feature/backend-refactor 2022-02-23 22:42:34 +03:00
Recaptcha.cs Merge branch 'develop' into feature/backend-refactor 2022-02-23 22:42:34 +03:00
SecutiryConstants.cs Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
SetupInfo.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
SpaceUsageStatManager.cs Merge branch 'develop' into feature/backend-refactor 2022-02-23 22:42:34 +03:00
StudioAdminMessageSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
StudioDefaultPageSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
StudioTrustedDomainSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
TariffSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
TipsSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
WebItemContext.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
WebItemManager.cs Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
WebItemSecurity.cs Common: return IEventBust to ICacheNotify 2022-02-14 12:05:05 +03:00
WebItemSecurityInfo.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00