Vashchuk Nikita
bce9c8029d
attachment as inline
2023-03-24 13:10:00 +05:00
Vashchuk Nikita
4d95d7c848
added roomRemoved as instant action
2023-03-07 19:37:04 +05:00
29abce027d
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/client/src/pages/Accounts.jsx
# packages/client/src/store/FilesActionsStore.js
# packages/common/constants/index.js
# products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
beb1834a0a
EF: batch operations
2023-02-27 16:39:52 +03:00
Vashchuk Nikita
efa04ae8ba
added functionality for notifying users about events via AuditEvent,
...
fix notifyEngine,
edited letter format,
added method for getting roomsId and roomsTitle from a file/folder inside the room,
added method for getting sharing info from foldersIds and userGuid
2023-02-21 13:35:01 +05:00
8a8143950d
replace CreateScope() => CreateScopeAsync()
2023-01-24 20:33:27 +03:00
d0fe06052e
Db: optimization
2022-12-21 15:57:32 +03:00
8d1393ba8e
Core: changed singleton to scope
2022-12-09 12:23:26 +03:00
130532927b
Merge branch 'develop' into feature/socket-newtag
2022-11-24 17:56:32 +03:00
e5863dddcc
fix
2022-11-15 17:07:51 +03:00
4432bf7d22
Socket: async, refactoring
...
Files: markasnew
2022-11-13 20:33:19 +03:00
789ab8f956
Merge branch 'develop' into feature/refactoring-saveUserInfo
...
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Core/FilesModule.cs
# products/ASC.Files/Service/Core/FoldersModule.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-11-09 12:57:16 +03:00
ca85ef1d49
fix usings
2022-11-07 12:34:50 +03:00
fa9dd5bd94
rename singnalR to socket
2022-10-27 15:37:26 +03:00
deb0c5beb7
remove .wait and .result
2022-10-27 13:49:42 +03:00
f54f31a3d1
remove waste asc.core.common
2022-09-07 15:45:23 +03:00
9523560b16
Push: fix api
2022-08-24 14:26:45 +03:00
ae49029f91
Push: fix api
2022-08-24 13:21:18 +03:00
ed41675476
Firebase: optimization
2022-08-24 12:34:30 +03:00
5967f4db97
Merge branch 'feature/push' of https://github.com/ONLYOFFICE/DocSpace into feature/push
2022-08-24 00:11:05 +03:00
d282aa74f7
Push: fixed message sending function
2022-08-24 00:10:37 +03:00
8f248f6ac2
Push: fix
2022-08-23 23:35:26 +03:00
632d7fbc41
Firebase: model
2022-08-23 20:03:02 +03:00
1ae7d3b11d
Api: push controller. Removed projects
2022-08-23 18:03:00 +03:00
26d493f498
Push: fix
2022-08-23 14:28:42 +03:00
971d4960c1
Push: fix
2022-08-23 13:23:00 +03:00
7f38657ce6
Push: global usings
2022-08-23 13:10:37 +03:00
c8e4ea7cec
Push: Newtonsoft.Json -> System.Text.Json
2022-08-23 12:05:09 +03:00
1c7d7fee77
Push: fix
2022-08-23 10:42:49 +03:00
ce5009d0c6
Push: fixes
2022-08-15 14:27:54 +03:00
46caff0b0c
Push: post merge fixes
2022-08-15 01:00:11 +03:00
020fa7dcda
Merge branch 'develop' into feature/push
2022-08-11 17:15:37 +03:00
8d89d8e8f2
Common: added dbcontext pool
2022-07-28 15:29:03 +03:00
a5f4435b17
fix notify
2022-07-20 22:06:33 +03:00
d8980cc3a7
fix 57917
2022-07-14 20:00:43 +03:00
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
cac16ace79
Push: api
2022-07-07 14:46:35 +03:00
273854bf84
Push: fix FirebaseHelper
2022-07-05 15:55:46 +03:00
191e66a238
Notify: fix warning
2022-07-04 16:55:11 +03:00
a289f9594a
modified LdapNotifyHelper to BackgroundService
2022-07-01 14:49:59 +03:00
45cd9434f4
fix Bug 57888
2022-06-30 19:41:17 +03:00
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
9e05dc641a
notify: temp logs
2022-06-28 23:32:33 +03:00
14404198c2
Push: fixed a sender sink
2022-06-27 13:36:38 +03:00
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
f59460405f
Push: push sender
2022-06-16 16:07:49 +03:00
1e47bf9bf3
Push: configuration
2022-06-15 17:25:23 +03:00
34bc4e143c
Push: helper, dao
2022-06-15 12:01:07 +03:00
a861268e4f
moved from ddf515b8
2022-06-01 17:07:08 +03:00
e7886aff2c
Log: refactoring
2022-05-26 12:01:54 +03:00
