IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c74da79ba2
DocSpace-client/common/services
History
Vashchuk Nikita c74da79ba2 Merge branch 'develop' into feature/async 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.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/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-01-12 22:07:21 +03:00
..
ASC.ApiSystem Merge branch 'master' into develop 2021-12-28 18:21:44 +03:00
ASC.AuditTrail spreading async in Files 2021-12-28 18:15:29 +03:00
ASC.ClearEvents net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
ASC.Data.Backup Merge branch 'develop' into feature/async 2021-12-02 12:02:50 +03:00
ASC.Data.Storage.Encryption net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
ASC.Data.Storage.Migration net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
ASC.ElasticSearch Files: optimization 2021-12-08 13:14:44 +03:00
ASC.Feed.Aggregator net6 2021-08-25 18:26:13 +03:00
ASC.Notify net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
ASC.Radicale net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
ASC.Socket.IO.Svc net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
ASC.SsoAuth.Svc net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
ASC.Studio.Notify net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
ASC.TelegramService net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
ASC.Thumbnails.Svc net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
ASC.UrlShortener.Svc net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
ASC.Webhooks.Service Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00