|
|
49f7ecf5f8
|
refactoring and bugfix
|
2022-02-24 16:49:34 +03:00 |
|
|
|
7f70d0be04
|
Merge branch 'feature/backend-refactor' into feature/winsw
|
2022-02-24 14:50:18 +03:00 |
|
|
|
707739813c
|
winsw: SsoAuth
|
2022-02-24 14:46:55 +03:00 |
|
|
|
a3ba7e2ecc
|
bugfix and refactoring urlShortener
|
2022-02-24 14:45:52 +03:00 |
|
|
|
16d16b0dca
|
update urlShortener
|
2022-02-24 11:37:41 +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 |
|
|
|
3cfb10d4d2
|
Socketio: fix
|
2022-02-23 17:08:00 +03:00 |
|
|
|
3d4e000778
|
Merge branch 'develop' into feature/async
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
|
2022-02-23 16:01:55 +03:00 |
|
|
|
1379800971
|
Files: fix async
|
2022-02-23 13:42:14 +03:00 |
|
|
|
2094fa112a
|
refactoring: update urlShortener
|
2022-02-22 16:45:14 +03:00 |
|
|
|
6f1ab3515f
|
delete urlShortener.svc
|
2022-02-22 15:54:44 +03:00 |
|
|
|
ac0e314f60
|
winsw: refactoring
update bats
relocate xml and exe
|
2022-02-22 15:45:21 +03:00 |
|
|
|
348e4cd1e0
|
winsw: bugfix urlShortener
|
2022-02-22 13:31:10 +03:00 |
|
|
|
b8b23d266d
|
winsw: update bats
|
2022-02-22 13:15:02 +03:00 |
|
|
|
a797b3490e
|
Files: async fixes
|
2022-02-22 12:22:15 +03:00 |
|
|
|
3aeac42444
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
|
2022-02-21 22:22:38 +03:00 |
|
|
|
780a1cf608
|
Merge branch 'feature/backend-refactor' into feature/refactoring-webhooks.core
|
2022-02-21 21:20:35 +03:00 |
|
|
|
5c7e46b9ab
|
winsw: add winsw
add urlShortener.xml
update bats
add winsw.exe
|
2022-02-21 20:46:23 +03:00 |
|
|
|
a4fb62546a
|
winsw: update urlShortener
get settings in appsettings.json
|
2022-02-21 20:45:39 +03:00 |
|
|
|
485fecd98a
|
Merge pull request #538 from ONLYOFFICE/feature/asc-ipsecurity-refactor
Feature/asc ipsecurity refactor
|
2022-02-18 20:31:55 +03:00 |
|
|
|
f62fc2ebeb
|
refactoring: webhooks.core
file scope namespace
Nullable in cs file
|
2022-02-18 13:55:48 +03:00 |
|
|
|
c9ebb7ff2c
|
Merge branch 'feature/backend-refactor' into feature/refactoring-webhooks.service
|
2022-02-18 13:55:32 +03:00 |
|
|
|
91133d243e
|
Merge pull request #537 from ONLYOFFICE/feature/asc-feed-aggreagator-refactor
Feature/asc feed aggreagator refactor
|
2022-02-18 13:50:46 +03:00 |
|
|
|
73bfe9ae4d
|
FeedAggregator: moved GetService() call
|
2022-02-18 13:47:55 +03:00 |
|
|
|
ad93df5934
|
FeedAggregated: TimedHostedService replaced by BackgroundService, removed scope, removed monitor
|
2022-02-18 12:48:06 +03:00 |
|
|
|
94f73cb1f8
|
WebhookService: used BackgroundService
|
2022-02-18 00:44:31 +03:00 |
|
|
|
0f36ff1bfa
|
WebhookService: renamed
|
2022-02-18 00:43:30 +03:00 |
|
|
|
efe995786c
|
Merge pull request #536 from ONLYOFFICE/bugfix/fix-clearevents-service
Bugfix/fix clearevents service
|
2022-02-17 20:51:25 +03:00 |
|
|
|
2feed87702
|
Merge pull request #525 from ONLYOFFICE/feature/asc-elasticsearch-refactor
Feature/asc elasticsearch refactor
|
2022-02-17 20:38:04 +03:00 |
|
|
|
434b1d261b
|
ElastichSearch: fix
|
2022-02-17 20:35:08 +03:00 |
|
|
|
f18ac08851
|
ElasticSearch: fix
|
2022-02-17 20:25:38 +03:00 |
|
|
|
df278ba35b
|
fix unsubscribe link
|
2022-02-17 18:55:10 +03:00 |
|
|
|
880d1b1bc5
|
ElasticSearchService: removed unnecessary scope
|
2022-02-17 18:25:33 +03:00 |
|
|
|
a57b733f67
|
ElasticSearch: removed an unnecessary GetService() call
|
2022-02-17 18:23:53 +03:00 |
|
|
|
e268764fb7
|
ElasticSearchService: removed unnecessary
|
2022-02-17 18:08:37 +03:00 |
|
|
|
e0984202d0
|
fix 55612
|
2022-02-17 18:06:03 +03:00 |
|
|
|
894a061fbb
|
ElasticSearchService: IHostedService replaced by BackgroundService, removed scope
|
2022-02-17 18:02:33 +03:00 |
|
|
|
77cb2b5ccc
|
Merge pull request #524 from ONLYOFFICE/feature/asc-storage-refactor
Feature/asc storage refactor
|
2022-02-17 15:46:28 +03:00 |
|
|
|
e3b894a21a
|
ResManager: fix
|
2022-02-17 14:47:50 +03:00 |
|
|
|
e7dfa142d6
|
Subscription: fix
|
2022-02-16 20:34:21 +03:00 |
|
|
|
0caf6fd083
|
Merge pull request #523 from ONLYOFFICE/feature/asc-reassigns-refactor
Feature/asc reassigns refactor
|
2022-02-16 19:22:11 +03:00 |
|
Vashchuk Nikita
|
0a384b2c28
|
refactoring async methods
|
2022-02-16 15:57:37 +03:00 |
|
|
|
d139c407d9
|
BackapCore: remove empty lines
|
2022-02-16 13:14:00 +03:00 |
|
|
|
43892a29c6
|
Merge branch 'feature/backend-refactor' into feature/asc-storage-refactor
# Conflicts:
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
# common/ASC.Data.Storage/Configuration/StorageSettings.cs
# common/ASC.Data.Storage/Constants.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/Encryption/EncryptionServiceClient.cs
# common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
# common/ASC.Data.Storage/Extensions.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/Migration/MigrateServiceClient.cs
# common/ASC.Data.Storage/PathUtils.cs
# common/ASC.Data.Storage/ProgressStream.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.Data.Storage/StorageUploader.cs
# common/ASC.Data.Storage/TenantPath.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# common/ASC.Data.Storage/WebPath.cs
# common/ASC.Data.Storage/Wildcard.cs
|
2022-02-16 12:47:11 +03:00 |
|
|
|
7ff7a449f7
|
Merge branch 'feature/backend-refactor' into feature/asc-reassigns-refactor
# Conflicts:
# common/ASC.Data.Reassigns/QueueWorker.cs
|
2022-02-16 11:18:57 +03:00 |
|
|
|
a76ad4c2a1
|
Merge branch 'feature/backend-refactor' into feature/asc-backup-core-refactor
# Conflicts:
# common/ASC.Data.Backup.Core/ActionInvoker.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/Core/DbBackupProvider.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/Core/ZipOperator.cs
# common/ASC.Data.Backup.Core/Exceptions/ThrowHelper.cs
# common/ASC.Data.Backup.Core/Extensions/EnumerableExtensions.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/ColumnMapper.cs
# common/ASC.Data.Backup.Core/Tasks/Data/DataRowInfo.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/KeyHelper.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/MailModuleSpecifics.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/ModuleProvider.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/ModuleSpecificsBase.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/ProjectsModuleSpecifics.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/RestoreDbModuleTask.cs
# common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
|
2022-02-15 19:56:43 +03:00 |
|
|
|
697dd5dd39
|
fix 53348
|
2022-02-15 19:30:27 +03:00 |
|
|
|
b9234fedb1
|
IpSecurity: fix
|
2022-02-15 18:57:45 +03:00 |
|
|
|
2f197c6313
|
Merge branch 'feature/backend-refactor' into feature/asc-ipsecurity-refactor
|
2022-02-15 18:53:38 +03:00 |
|
