Vashchuk Nikita
|
0a384b2c28
|
refactoring async methods
|
2022-02-16 15:57:37 +03:00 |
|
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
|
7164c54b44
|
fix
|
2022-02-10 21:25:40 +03:00 |
|
|
4bf841581f
|
Analizators/U2U1104
|
2022-01-14 16:12:37 +03:00 |
|
|
9bc8584184
|
analizators/U2U1103
|
2022-01-13 15:53:57 +03:00 |
|
|
4155f911c0
|
analizators/U2U1025
|
2022-01-13 14:19:39 +03:00 |
|
|
66cf28ba29
|
analizators/U2U1100
|
2022-01-12 18:42:03 +03:00 |
|
|
6961f38593
|
analizators/U2U1023
|
2022-01-12 15:34:58 +03:00 |
|
|
6c32e34b40
|
analizators/s1848
|
2021-12-30 15:04:47 +03:00 |
|
|
13e13f2303
|
Net: fix requests
|
2021-11-24 22:34:39 +03:00 |
|
|
e310d5e655
|
net6: httpClient: add using
|
2021-10-21 17:56:31 +03:00 |
|
|
f6f317ec42
|
net6: refactoring and bugfix
|
2021-10-21 16:23:26 +03:00 |
|
|
b6461e46f4
|
net6: replacing System.Drawing with ImageSharp
|
2021-10-18 14:24:05 +03:00 |
|
|
735a9b60cf
|
net6: warning CA1416
also remove unnecessary usings
|
2021-10-13 11:07:03 +03:00 |
|
|
ae9a3187bc
|
net6: warning SYSLIB0014
|
2021-10-12 13:14:33 +03:00 |
|
|
cf87addaa3
|
Security: added new method
|
2021-08-18 17:04:16 +03:00 |
|
|
6fbdaf0d31
|
Calendar: post-merge fixes
|
2021-07-27 16:09:30 +03:00 |
|
|
d783bd8ab4
|
crm: fixed warnings
|
2021-06-18 20:38:32 +03:00 |
|
|
3018e1822f
|
crm: fix path
|
2021-06-16 17:30:31 +03:00 |
|
|
58e7e41cdd
|
crm: code cleanup
|
2021-06-04 17:38:42 +03:00 |
|
|
ccd30b7b90
|
crm: refactoring. used JsonPropertyName instead of DataMember
|
2021-05-31 19:14:59 +03:00 |
|
|
a9a7c0a4b7
|
crm: refactoring
|
2021-05-28 20:20:12 +03:00 |
|
|
401c8ca2e2
|
crm: migrate from newtonsoft to system.text.json
|
2021-05-28 18:18:55 +03:00 |
|
|
c8e5c5a93c
|
crm: migrate from ProgressQueue to DistributedTaskQueue
|
2021-05-24 12:56:49 +03:00 |
|
|
f1ca0971fd
|
crm: fixed work with sql queries
|
2021-05-15 17:42:16 +03:00 |
|
|
92ce702b28
|
crm: refactoring. bugfix
|
2021-05-05 17:09:05 +03:00 |
|
|
635d20580f
|
crm: refactoring
|
2021-04-06 20:33:28 +03:00 |
|
|
11acb31f54
|
crm: refactoring
|
2021-03-23 18:41:56 +03:00 |
|
|
6da70a1449
|
crm: refactoring
|
2021-03-19 19:56:26 +03:00 |
|
|
30222afaa4
|
crm: refactoring
|
2021-03-13 21:00:08 +03:00 |
|
|
561739f490
|
crm: migrate HttpHandler to Middleware
|
2021-03-13 15:22:14 +03:00 |
|
|
5e42dab1e9
|
crm: refactoring
|
2021-03-10 18:38:56 +03:00 |
|
|
7fab0b47d7
|
crm: refactoring code
|
2021-03-09 18:37:16 +03:00 |
|
|
e061a6db9e
|
crm: migrate from old project
|
2021-03-02 19:29:07 +03:00 |
|
|
8afbae082e
|
crm: migrate from old project
|
2021-03-01 20:36:18 +03:00 |
|
|
083d25bcd6
|
CRM: продолжаю переносить проект
|
2021-02-24 19:50:07 +03:00 |
|
|
a6d618ce96
|
crm: migrate Api to EF Core
|
2020-04-22 23:46:49 +03:00 |
|
|
dda75ec8a3
|
crm: migrate Api to EF Core
|
2020-04-18 20:49:09 +03:00 |
|
|
35762e45ee
|
crm: migrate Api to EF Core
|
2020-04-16 22:41:37 +03:00 |
|
|
9928c9bc46
|
crm: migrate DAO to EF Core
|
2020-04-14 21:59:32 +03:00 |
|
|
f76724aa04
|
crm: migrate DAO to EF Core
|
2020-04-14 17:35:52 +03:00 |
|
|
4fb3f62086
|
crm: migrate DAO to EF Core
|
2020-04-14 10:59:07 +03:00 |
|
|
f8f3f09cc4
|
crm: migrate DAO to EF Core
|
2020-04-10 00:22:26 +03:00 |
|
|
6313464cdf
|
crm: migrate DAO to EF Core
|
2020-04-02 22:42:03 +03:00 |
|
|
cc2824a660
|
migrate DAO to EF Core
|
2020-03-11 18:10:53 +03:00 |
|
|
5783511366
|
ASC.CRM: first commit
|
2020-03-02 18:38:31 +03:00 |
|