|
8b92df64e4
|
crm: fix logs
|
2022-05-31 18:34:04 +03:00 |
|
|
ee7dddac5d
|
crm: fix crm api
|
2022-05-31 17:01:58 +03:00 |
|
|
52cdf0758e
|
fix crm
|
2022-05-19 18:47:59 +03:00 |
|
|
c9f8064224
|
Merge branch 'feature/backend-refactor' into feature/files-refactor
|
2022-03-10 12:31:05 +03:00 |
|
|
d035deba31
|
Merge branch 'feature/backend-refactor' into feature/files-refactor
# Conflicts:
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Server/GlobalUsings.cs
|
2022-03-05 11:50:42 +03:00 |
|
|
475269ee84
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
# products/ASC.Files/Core/Model/FileEntryWrapper.cs
# products/ASC.Files/Core/Model/FileShareWrapper.cs
# products/ASC.Files/Core/Model/FileWrapper.cs
# products/ASC.Files/Core/Model/FolderWrapper.cs
# products/ASC.People/Server/GlobalUsings.cs
|
2022-03-05 11:27:58 +03:00 |
|
|
4a61f9fce5
|
VoipService: refactor mapping
|
2022-03-04 19:35:12 +03:00 |
|
|
1d398d47f6
|
Merge branch 'feature/backend-refactor' into feature/files-refactor
|
2022-03-04 13:25:12 +03:00 |
|
|
c887362ea3
|
People: separated people controller
|
2022-02-28 22:23:39 +03:00 |
|
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 |
|
|
0ee1a35424
|
analizators/U2U1115
|
2022-01-17 11:22:52 +03:00 |
|
|
4bf841581f
|
Analizators/U2U1104
|
2022-01-14 16:12:37 +03:00 |
|
|
66cf28ba29
|
analizators/U2U1100
|
2022-01-12 18:42:03 +03:00 |
|
|
c43f244282
|
analizators/U2U1003
|
2022-01-10 18:13:30 +03:00 |
|
|
d181d43b36
|
Merge branch 'develop' into feature/async
# Conflicts:
# common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/ASC.Files.csproj
|
2021-12-02 12:02:50 +03:00 |
|
Vashchuk Nikita
|
43e2a65081
|
Spreading async in Files
|
2021-11-15 14:31:47 +03:00 |
|
|
f6f317ec42
|
net6: refactoring and bugfix
|
2021-10-21 16:23:26 +03:00 |
|
|
735a9b60cf
|
net6: warning CA1416
also remove unnecessary usings
|
2021-10-13 11:07:03 +03:00 |
|
Vashchuk Nikita
|
1896457adb
|
added asynchrony to FileDao
|
2021-08-26 15:32:44 +03:00 |
|
|
b791586252
|
net6
|
2021-08-25 18:26:13 +03:00 |
|
|
c6ede6fff7
|
Merge branch 'develop' into feature/remove_itemList
|
2021-06-29 12:47:56 +03:00 |
|
|
a3cccc4044
|
crm: migrate from FromForm to FromBody attribute
|
2021-06-28 12:42:42 +03:00 |
|
|
3f2dfeb5a9
|
crm: started migrate from FromForm to FromBody attribute. bugfix
|
2021-06-25 16:58:42 +03:00 |
|
|
6e9d64da7a
|
Merge branch 'develop' into feature/remove_itemList
|
2021-06-24 11:21:46 +03:00 |
|
|
a4aa4843e8
|
crm: started migrate from FromForm to FromBody attribute
|
2021-06-23 22:32:56 +03:00 |
|
|
dd64101332
|
remove itemList
|
2021-06-18 15:56:15 +03:00 |
|
|
b925943cb6
|
merge from develop
|
2021-06-07 17:23:25 +03:00 |
|
|
fc20a742a1
|
crm: refactoring
|
2021-06-04 19:27:44 +03:00 |
|
|
58e7e41cdd
|
crm: code cleanup
|
2021-06-04 17:38:42 +03:00 |
|
|
e75e048e49
|
crm: fixed build
|
2021-06-02 18:24:49 +03:00 |
|
|
401c8ca2e2
|
crm: migrate from newtonsoft to system.text.json
|
2021-05-28 18:18:55 +03:00 |
|
|
bbe1f1f205
|
crm: code refactoring
|
2021-05-17 17:50:55 +03:00 |
|
|
92ce702b28
|
crm: refactoring. bugfix
|
2021-05-05 17:09:05 +03:00 |
|
|
b54e3d3b4c
|
added support AutoMapper for Db Entity
|
2021-04-15 18:20:43 +03:00 |
|
|
635d20580f
|
crm: refactoring
|
2021-04-06 20:33:28 +03:00 |
|
|
ec05e8dc9a
|
crm: refactoring & bugfix
|
2021-03-24 18:55:47 +03:00 |
|
|
11acb31f54
|
crm: refactoring
|
2021-03-23 18:41:56 +03:00 |
|
|
1fac4bc1fe
|
crm: refactoring
|
2021-03-22 18:48:08 +03:00 |
|
|
2b1b3e508f
|
crm: refactoring
|
2021-03-22 15:42:03 +03:00 |
|
|
c0d9a1572c
|
crm: refactoring
|
2021-03-22 14:56:42 +03:00 |
|
|
9182d0aac2
|
crm: bug fix
|
2021-03-22 14:38:28 +03:00 |
|
|
6da70a1449
|
crm: refactoring
|
2021-03-19 19:56:26 +03:00 |
|
|
19b9067d65
|
crm: refactoring
|
2021-03-17 14:50:13 +03:00 |
|
|
4902cb6a74
|
crm: refactoring. migrate ReportsController and VoIPController
|
2021-03-15 14:36:22 +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 |
|