Vashchuk Nikita
|
631dcdc2e8
|
Merge branch 'develop' into feature/async
# Conflicts:
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.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.Storage/CrossModuleTransferUtility.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Extensions.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# products/ASC.CRM/Server/Api/VoipController.cs
# products/ASC.CRM/Server/Core/Dao/RelationshipEventDao.cs
# products/ASC.CRM/Server/Utils/PdfCreator.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/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.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/CrossDao.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/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.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/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/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.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/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.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/MailMergeTask.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.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/Recaptcha.cs
# web/ASC.Web.Core/Utility/UrlShortener.cs
|
2022-02-12 00:51:48 +03:00 |
|
Vashchuk Nikita
|
2901d837a1
|
async methods for httpClient in ASC.Web
|
2022-01-31 17:35:36 +03:00 |
|
|
9bc8584184
|
analizators/U2U1103
|
2022-01-13 15:53:57 +03:00 |
|
|
3aae413e12
|
replace Path.Combine to CrossPlatform.PathCombine
|
2021-04-16 16:26:26 +03:00 |
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
a5280a1694
|
Added DIHelper
|
2020-02-17 11:58:14 +03:00 |
|
|
ff84afb110
|
Merge branch 'master' into feature/elastic
# Conflicts:
# web/ASC.Web.Core/SetupInfo.cs
|
2020-02-05 11:43:03 +03:00 |
|
|
767448acb9
|
Files: EF, DI
|
2020-02-04 11:41:04 +03:00 |
|
|
a93d7adda6
|
moved from hotfix/10.5.2
|
2020-01-23 11:52:07 +03:00 |
|
|
f5b3f2838b
|
moved from hotfix/10.5.2
|
2020-01-22 16:59:49 +03:00 |
|
|
402c4d908d
|
DI: refactoring
|
2019-10-31 14:28:30 +03:00 |
|
|
6de13b9d50
|
DI: configuration
|
2019-09-23 15:20:08 +03:00 |
|
|
181e570ce1
|
DI: CommonServiceProvider
|
2019-09-20 16:06:10 +03:00 |
|
|
473207f9a4
|
DI: BaseSettings
|
2019-09-13 14:18:27 +03:00 |
|
|
1530ec842e
|
DI: WebImageSupplier,WebItemSettings, SettingsManager
|
2019-09-11 13:42:52 +03:00 |
|
|
12747318c6
|
Optimization
|
2019-08-30 15:40:57 +03:00 |
|
|
f6d78d3cba
|
Code Cleanup
|
2019-08-15 15:04:42 +03:00 |
|
|
ca6fdb500d
|
Remove HttpContext.Current
|
2019-07-02 18:30:31 +03:00 |
|
|
3fc2786366
|
Api.People: default avatars
|
2019-06-07 18:32:20 +03:00 |
|
|
531763fa1c
|
Added ASC.Web.Core
|
2019-06-07 11:59:07 +03:00 |
|