Commit Graph

7145 Commits

Author SHA1 Message Date
Vashchuk Nikita
0a384b2c28 refactoring async methods 2022-02-16 15:57:37 +03:00
Vashchuk Nikita
b17119b711 refactoring async methods 2022-02-15 16:20:06 +03:00
Vashchuk Nikita
41d994ca32 fix 2022-02-15 12:42:47 +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
4fb0bf2e46 fix 2022-02-11 21:18:12 +03:00
6b8304304f fixed starting services 2022-02-11 19:01:38 +03:00
Vashchuk Nikita
7164c54b44 fix 2022-02-10 21:25:40 +03:00
77e14da218 fixed tests 2022-02-10 16:24:55 +03:00
b1be9953ad fixed solution build 2022-02-07 22:15:32 +03:00
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
37c88dad50 Analyzers: fix 2022-02-07 18:10:27 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
Vashchuk Nikita
5aa99ec811 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/services/ASC.AuditTrail/AuditEventsRepository.cs
#	common/services/ASC.AuditTrail/LoginEventsRepository.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
2022-02-04 16:04:52 +03:00
Vashchuk Nikita
f4f7a406b1 fix 2022-02-03 14:52:14 +03:00
34dab043e0 Merge branch 'develop' into feature/analizators
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
2022-02-03 12:55:33 +03:00
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
bb28679fdf analizators: bugfix 2022-02-02 14:05:06 +03:00
Vashchuk Nikita
2901d837a1 async methods for httpClient in ASC.Web 2022-01-31 17:35:36 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
Dmitry Kulak
23fc1a7b46 Web: Files: Badges: Renamed VersionBadgeWrapper to BadgeWrapper 2022-01-26 15:16:45 +03:00
Dmitry Kulak
b25e0c75b0 Web: Files: Tiles: Added border on hover for ok/cancel buttons while renaming 2022-01-26 14:42:01 +03:00
Dmitry Kulak
926f0c6a2e Web: Files: Changed "shared" icon 2022-01-26 14:09:43 +03:00
Dmitry Kulak
0e6c866ca6 Web: Files: Badges: Extracted common Badge props to object 2022-01-25 14:24:27 +03:00
Dmitry Kulak
a46ea93d32
Merge branch 'develop' into feature/redesign-tiles 2022-01-25 13:37:04 +03:00
Vashchuk Nikita
3e03f820bb async IDataStore 2022-01-25 12:29:11 +03:00
7f31d3f19f
Merge pull request #494 from ONLYOFFICE/feature/refactoring-one-dbcontext-in-dao
used one dbcontext per service (per DAO). fixed error: System.Invalid…
2022-01-25 11:14:23 +03:00
Dmitry Kulak
67a749c7b3
Merge branch 'develop' into feature/redesign-tiles 2022-01-25 10:14:13 +03:00
445f03097d Fix content-type header 2022-01-24 22:44:18 +03:00
Dmitry Kulak
eb6573bea0 Web: Files: Badges: Renamed handleClick to onClick 2022-01-24 21:04:46 +03:00
Dmitry Kulak
ec47211e1d Merge branch 'develop' into feature/redesign-tiles 2022-01-24 17:46:59 +03:00
Dmitry Kulak
8b6936265c Web: Files: Tiles: removed background while renaming 2022-01-24 17:17:58 +03:00
Dmitry Kulak
c70e17459b Web: Files: Tiles: Added wrapper for version and "New" badges, refactoring 2022-01-24 16:49:27 +03:00
fce8d26cef analizators/ca1507 2022-01-24 13:49:00 +03:00
fb3a61d0d2 analizators/s3442 2022-01-24 12:57:01 +03:00
Dmitry Kulak
dc7e3d78d0 Web: Files: Tiles: Changed font size for file and folder names 2022-01-24 10:54:29 +03:00
9ac985c2f2 crm: CurrencyProvider: fixed init in constructor 2022-01-21 20:32:55 +03:00
8d0324ee2a analizators/s2326 2022-01-21 16:59:17 +03:00
Dmitry Kulak
83fd179e0a Web: Files: Tiles: Fix after merge 2022-01-21 16:51:59 +03:00
Dmitry Kulak
b740a4d00a Merge branch 'develop' into feature/redesign-tiles
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Server/DocStore
2022-01-21 16:47:39 +03:00
667697f933 analizators/s2259 2022-01-21 16:46:30 +03:00
4be25479fd used one dbcontext per service (per DAO). fixed error: System.InvalidOperationException: 'Cannot use multiple context instances within a single query execution. Ensure the query uses a single context instance.' 2022-01-21 16:45:50 +03:00
510bd4d731 analizators/s2219 2022-01-21 16:42:02 +03:00
cc53cd53e8 Analizators/s1939 2022-01-21 16:40:08 +03:00
f3d8b8d17a analizators/s1854 2022-01-21 16:36:36 +03:00
fb65d3a09d analizators/1481 2022-01-21 16:15:15 +03:00
3d635a4824 analizators/1643 2022-01-21 16:12:05 +03:00
2029c34f9c analizators/s1121 2022-01-21 14:02:17 +03:00
cd12b41cc6 analizators/s1125 2022-01-21 14:01:52 +03:00
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00