Commit Graph

16935 Commits

Author SHA1 Message Date
a73606f1f9 Files: used implicit usings 2022-03-01 17:26:30 +03:00
0cf7b005d1 Merge branch 'feature/backend-refactor' into feature/asc-files-core-refactor 2022-03-01 17:06:27 +03:00
7a669f9293 Files: refactor 2022-03-01 16:10:58 +03:00
f77b210524 fix warning 2022-03-01 13:37:36 +03:00
fe77e0a331 fix build 2022-03-01 13:36:34 +03:00
3974eabfad
Merge pull request #557 from ONLYOFFICE/feature/asc-core-common-refactor
Feature/asc core common refactor
2022-03-01 11:18:30 +03:00
e8b673eb29 Merge branch 'feature/backend-refactor' into feature/asc-core-common 2022-03-01 11:17:12 +03:00
ae414db669
Merge pull request #545 from ONLYOFFICE/feature/refactoring-telegram-service
refactoring: telegram service
2022-03-01 11:07:15 +03:00
6d3a0e2d82 Merge branch 'feature/backend-refactor' into feature/refactoring-telegram-service 2022-03-01 10:56:21 +03:00
f34e89cce8 telegram: CancellationToken to StartReceiving() 2022-02-28 16:11:54 +03:00
d5c55fc384 FilesCore: reorganize dto 2022-02-28 14:26:29 +03:00
b56260bc38 FilesCore: Models to ApiModels 2022-02-28 14:15:31 +03:00
49a4c9e570 FilesCore: modet to dto 2022-02-28 14:06:30 +03:00
fe15811c8f Core: refactor 2022-02-28 12:06:06 +03:00
3e8164e146 refactoring: telegram service 2022-02-28 11:35:59 +03:00
e6f111f651 Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor 2022-02-25 20:16:00 +03:00
0635eea567
Merge pull request #549 from ONLYOFFICE/feature/asc-notify-textile-refactor
Feature/asc notify textile refactor
2022-02-25 18:19:22 +03:00
bdb7672aaf
Merge pull request #558 from ONLYOFFICE/feature/asc-notify-refactor
Feature/asc notify refactor
2022-02-25 18:19:06 +03:00
5a19f21902
Merge pull request #559 from ONLYOFFICE/feautre/asc-messaging-system-refactor
Feautre/asc messaging system refactor
2022-02-25 17:53:44 +03:00
6a78a263b4
Merge pull request #550 from ONLYOFFICE/feature/asc-feed-refactor
Feature/asc feed refactor
2022-02-25 17:32:20 +03:00
71bfac088f added usings 2022-02-25 17:31:21 +03:00
66021c7885 Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor 2022-02-25 17:30:59 +03:00
80ce5d980f Notiyf: renamed to services, reorganization, added implicit usings 2022-02-25 16:50:31 +03:00
6495da0d0b Merge branch 'feature/backend-refactor' into feature/asc-messaging-system-refactor 2022-02-25 16:34:15 +03:00
b4eecac091 Merge branch 'feature/backend-refactor' into feature/asc-notify-textile-refactor 2022-02-25 16:29:34 +03:00
ebf90d8aa9
Merge pull request #564 from ONLYOFFICE/feature/asc-files-service-refactor
Feature/asc files service refactor
2022-02-25 16:27:20 +03:00
65216705a5 FilesService: added missing configure logging 2022-02-25 16:20:05 +03:00
b1e5a6e28b Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor 2022-02-25 16:16:56 +03:00
9c3274b5bd FilesCore: refactor 2022-02-25 13:38:21 +03:00
85b03b508a FilesCore: added IServiceScopeFactory, refactor 2022-02-25 13:04:37 +03:00
178671ea56 FilesService: add implicit 2022-02-24 23:55:29 +03:00
ad30ce26ce FilesService: refactor 2022-02-24 23:28:07 +03:00
6d4f615350 FilesCore: used files-scoped namespaces 2022-02-24 22:34:26 +03:00
b6b8c4c7b5 FilesCore: privated properties replaced by private fields, added braces 2022-02-24 21:36:57 +03:00
6b7fe6461f fix socketio 2022-02-24 14:57:21 +03:00
d7566d0743 Merge branch 'develop' into feature/backend-refactor 2022-02-24 14:55:31 +03:00
6fb3547652 Files: fix sql 2022-02-24 14:45:58 +03:00
51f79fa0e9 Files: fix track 2022-02-24 14:35:14 +03:00
d4e48004bc added socketio 2022-02-24 13:47:18 +03:00
9d0f1500e6 Files: fix routing 2022-02-24 13:24:39 +03:00
0f44d7fb4b FilesService: refactor 2022-02-24 13:03:21 +03:00
04b0ac97d2 FilesService: used BackgroundService 2022-02-24 12:51:12 +03:00
b974d15ddd FilesService: used file-scoped namespaces 2022-02-24 12:00:51 +03:00
b3317f35fc FilesService: used WebApplicationBuilder 2022-02-24 11:58:41 +03:00
89f72e80ad FilesService: private properties replaced by private fields, added braces 2022-02-24 11:40:21 +03:00
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
8563fbc373 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/Middleware/CommonApiResponse.cs
#	common/ASC.Api.Core/Middleware/ResponseWrapper.cs
#	common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs
#	products/ASC.Files/Core/Configuration/FilesSettings.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
2022-02-23 17:37:34 +03:00
a700e70d86
Merge pull request #532 from ONLYOFFICE/feature/async
Feature/async
2022-02-23 17:20:28 +03:00
d65d30ec24 Test: disable socketio 2022-02-23 17:10:04 +03:00
81b33e673a Files: fix warnings 2022-02-23 17:09:32 +03:00