IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,654 Commits 40 Branches 22 Tags 420 MiB
1f531d5f9b
Commit Graph

245 Commits

Author SHA1 Message Date
pavelbannov
ca85ef1d49 fix usings 2022-11-07 12:34:50 +03:00
SuhorukovAnton
fa9dd5bd94 rename singnalR to socket 2022-10-27 15:37:26 +03:00
SuhorukovAnton
f54f31a3d1 remove waste asc.core.common 2022-09-07 15:45:23 +03:00
Nikolay Rechkin
9523560b16 Push: fix api 2022-08-24 14:26:45 +03:00
Nikolay Rechkin
ae49029f91 Push: fix api 2022-08-24 13:21:18 +03:00
pavelbannov
ed41675476 Firebase: optimization 2022-08-24 12:34:30 +03:00
Nikolay Rechkin
5967f4db97 Merge branch 'feature/push' of https://github.com/ONLYOFFICE/DocSpace into feature/push 2022-08-24 00:11:05 +03:00
Nikolay Rechkin
d282aa74f7 Push: fixed message sending function 2022-08-24 00:10:37 +03:00
Nikolay Rechkin
8f248f6ac2 Push: fix 2022-08-23 23:35:26 +03:00
pavelbannov
632d7fbc41 Firebase: model 2022-08-23 20:03:02 +03:00
pavelbannov
1ae7d3b11d Api: push controller. Removed projects 2022-08-23 18:03:00 +03:00
Nikolay Rechkin
26d493f498 Push: fix 2022-08-23 14:28:42 +03:00
Nikolay Rechkin
971d4960c1 Push: fix 2022-08-23 13:23:00 +03:00
Nikolay Rechkin
7f38657ce6 Push: global usings 2022-08-23 13:10:37 +03:00
Nikolay Rechkin
c8e4ea7cec Push: Newtonsoft.Json -> System.Text.Json 2022-08-23 12:05:09 +03:00
Nikolay Rechkin
1c7d7fee77 Push: fix 2022-08-23 10:42:49 +03:00
Nikolay Rechkin
ce5009d0c6 Push: fixes 2022-08-15 14:27:54 +03:00
Nikolay Rechkin
46caff0b0c Push: post merge fixes 2022-08-15 01:00:11 +03:00
Nikolay Rechkin
020fa7dcda Merge branch 'develop' into feature/push 2022-08-11 17:15:37 +03:00
pavelbannov
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
pavelbannov
a5f4435b17 fix notify 2022-07-20 22:06:33 +03:00
pavelbannov
d8980cc3a7 fix 57917 2022-07-14 20:00:43 +03:00
pavelbannov
7af929fee8 Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.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.People/Server/Controllers/PeopleController.cs
#	products/ASC.People/Server/Models/MemberModel.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2022-07-07 17:41:41 +03:00
Nikolay Rechkin
cac16ace79 Push: api 2022-07-07 14:46:35 +03:00
Nikolay Rechkin
273854bf84 Push: fix FirebaseHelper 2022-07-05 15:55:46 +03:00
pavelbannov
191e66a238 Notify: fix warning 2022-07-04 16:55:11 +03:00
pavelbannov
a289f9594a modified LdapNotifyHelper to BackgroundService 2022-07-01 14:49:59 +03:00
pavelbannov
45cd9434f4 fix Bug 57888 2022-06-30 19:41:17 +03:00
pavelbannov
74d238bde8 Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Common/Logging/Log.cs
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Backup.Core/BackupResource.Designer.cs
#	common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
#	products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
#	products/ASC.Files/Core/Core/Compress/CompressToZip.cs
#	products/ASC.Files/Core/Core/Compress/ICompress.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Resources/FilesJSResource.Designer.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/Utils/EntryManager.cs
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
 2022-06-30 16:13:31 +03:00
pavelbannov
9e05dc641a notify: temp logs 2022-06-28 23:32:33 +03:00
Nikolay Rechkin
14404198c2 Push: fixed a sender sink 2022-06-27 13:36:38 +03:00
pavelbannov
e2cee2c2fc Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.FederatedLogin/OAuth20Token.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/ASC.Resource.Manager/Program.cs
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	config/appsettings.json
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.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/ThumbnailSettings.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/Model/SessionModel.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.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/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/DocStore
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Server/ASC.People.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/Resource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
 2022-06-19 22:44:48 +03:00
Nikolay Rechkin
f59460405f Push: push sender 2022-06-16 16:07:49 +03:00
Nikolay Rechkin
1e47bf9bf3 Push: configuration 2022-06-15 17:25:23 +03:00
Nikolay Rechkin
34bc4e143c Push: helper, dao 2022-06-15 12:01:07 +03:00
pavelbannov
a861268e4f moved from ddf515b8 2022-06-01 17:07:08 +03:00
pavelbannov
e7886aff2c Log: refactoring 2022-05-26 12:01:54 +03:00
pavelbannov
a66c03aa86 Merge branch 'develop' into feature/logger-refactoring 
# Conflicts:
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Storage/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
#	common/services/ASC.Notify/GlobalUsings.cs
#	common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
#	common/services/ASC.Notify/Services/NotifySenderService.cs
#	common/services/ASC.TelegramService/GlobalUsings.cs
#	common/services/ASC.TelegramService/TelegramHandler.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
 2022-05-24 23:13:57 +03:00
pavelbannov
b525696b03 fix usings 2022-05-24 18:41:28 +03:00
Alexey Bannov
addf33bf5a telegram: remove cache from dao 2022-05-17 21:57:18 +03:00
Alexey Bannov
16cc806615 telegram: separate integration event 2022-05-17 20:53:46 +03:00
Alexey Bannov
7e6f8db8d9 telegram: update dependency 2022-05-17 18:27:34 +03:00
Alexey Bannov
d0525e298c thumbnails, notify, telegram: migrate from ICacheNotify to EventBus 2022-05-13 22:14:00 +03:00
Alexey Safronov
bd7d9ba8cf Web: Files: Added socket event ("s:modify-folder->update") on thumbnail creation on Server 2022-05-05 21:20:44 +03:00
SuhorukovAnton
b4ed3ecef4 add loggers in core.common 2022-05-05 17:13:47 +03:00
pavelbannov
7280772aef logging optimization 2022-04-28 18:53:28 +03:00
pavelbannov
89059cf32e Structured Logging 2022-04-28 12:15:33 +03:00
pavelbannov
13bbce8ea4 Custom logger replaced with Microsoft.Extensions.Logging 2022-04-26 20:53:48 +03:00
pavelbannov
97b45d3bd5 ILog: refactoring 2022-04-25 21:02:18 +03:00
pavelbannov
9eba173a44 Merge branch 'develop' into feature/backend-refactor 
# Conflicts:
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Model/CreateFileModel.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2022-04-21 22:36:29 +03:00