|
ed42050de3
|
Merge branch 'feature/feed' into feature/doc-space-info-panel
|
2022-09-26 11:14:35 +03:00 |
|
|
7d19f090fb
|
Feed: refactor
|
2022-09-23 16:19:17 +03:00 |
|
|
d7e17828e0
|
Files: added additional parameters to feed
|
2022-09-23 14:57:04 +03:00 |
|
|
a51cde20c7
|
Merge branch 'develop' into feature/doc-space-info-panel
# Conflicts:
# products/ASC.Files/Service/Extensions/ConfigurationManagerExtension.cs
|
2022-09-16 18:26:36 +03:00 |
|
|
6563d4b633
|
nlog: refactoring service name
|
2022-09-16 16:41:51 +03:00 |
|
|
ee27ad4437
|
nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property
|
2022-09-15 17:44:04 +03:00 |
|
|
2556c805d3
|
File.Service: added feed config
|
2022-09-09 13:38:29 +03:00 |
|
|
46d0b89433
|
Merge pull request #788 from ONLYOFFICE/feature/rooms-feed
Feature/rooms feed
|
2022-09-06 14:46:49 +04:00 |
|
|
1a1b2c68b0
|
backend: refactoring start application
|
2022-09-06 11:29:01 +03:00 |
|
|
4ddfe898f5
|
File.Service: refactor
|
2022-09-02 18:59:30 +03:00 |
|
|
4a50770792
|
Feed: refactor
|
2022-09-02 18:58:53 +03:00 |
|
|
8e82656e57
|
Files.Service: added context id for folders inside the room
|
2022-08-31 20:06:57 +03:00 |
|
|
257693d3f6
|
Files.Service: added context id for files inside the room
|
2022-08-31 20:06:49 +03:00 |
|
|
c35d51bd8e
|
Files.Service: added rooms module
|
2022-08-31 16:11:51 +03:00 |
|
|
e811c0e496
|
Files.Service: refactor
|
2022-08-31 16:10:42 +03:00 |
|
|
f8a2b8caef
|
Files: fix cast
|
2022-08-31 13:02:22 +03:00 |
|
|
2314d6fc47
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-11 22:33:13 +03:00 |
|
|
ea2f03331b
|
refactoring
|
2022-08-09 19:13:07 +03:00 |
|
|
baaec9dcef
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-09 16:27:35 +03:00 |
|
|
a73b9cf2e4
|
Files: async fix
|
2022-08-08 23:03:58 +03:00 |
|
|
870c3cf3c4
|
warm up services
|
2022-08-08 19:25:22 +03:00 |
|
|
9149d08937
|
Files: async
|
2022-08-04 13:47:18 +03:00 |
|
|
fe5c8b0b13
|
fixed tests and tools
|
2022-07-29 20:23:19 +03:00 |
|
|
dba122eb96
|
Common, files: added dbcontext pool
|
2022-07-28 21:00:49 +03:00 |
|
|
8d89d8e8f2
|
Common: added dbcontext pool
|
2022-07-28 15:29:03 +03:00 |
|
|
8acb550b08
|
files helpers moved to ASC.Files.Core
|
2022-07-25 14:03:31 +03:00 |
|
|
ee9e381b26
|
fixed async
|
2022-07-13 20:09:43 +03:00 |
|
|
fa8898d522
|
Files: fixed converter
|
2022-07-12 14:18:26 +03:00 |
|
|
7e34e45371
|
ElasticSearch: disabled by default
|
2022-07-01 12:53:18 +03:00 |
|
|
de068f869e
|
thumb: fix
|
2022-06-29 20:55:01 +03:00 |
|
|
75be0827d7
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
# Conflicts:
# products/ASC.Files/Service/GlobalUsings.cs
|
2022-06-29 20:01:27 +03:00 |
|
|
5ccd9d01a5
|
DeleteExpiredService: launch frequency
|
2022-06-29 18:34:50 +03:00 |
|
|
21ea7ec019
|
first version: delete expired service
|
2022-06-29 11:55:54 +03:00 |
|
|
5cc38b95df
|
add fFmpegFormats and imageFormatsCanBeCrop
|
2022-06-28 14:39:20 +03:00 |
|
|
fef096b0a5
|
fix generating thumbnails for video
|
2022-06-24 16:22:52 +03:00 |
|
|
c9eaeed719
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
|
2022-06-23 12:09:13 +03:00 |
|
|
5bcbae5711
|
fix
|
2022-06-23 11:48:31 +03:00 |
|
|
1aadf26fe2
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-21 17:05:04 +03:00 |
|
|
0a27a98511
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-21 10:52:53 +03:00 |
|
|
72f0ac4f9b
|
file converter server: fixed bugs
|
2022-06-20 19:58:08 +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 |
|
|
8ea04bcc81
|
Merge branch 'develop' into feature/12.0
# Conflicts:
# common/ASC.MessagingSystem/Data/MessagesRepository.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
|
2022-06-17 19:19:00 +03:00 |
|
|
29d3bb3fee
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-17 13:18:03 +03:00 |
|
|
56ece27e1b
|
moved from ddf515b8
|
2022-06-16 17:16:46 +03:00 |
|
|
0d1239af95
|
add thumbnails for video
|
2022-06-16 16:43:29 +03:00 |
|
|
c9fb0d3dac
|
moved from ddf515b8
|
2022-06-16 11:13:53 +03:00 |
|
|
d132f0d565
|
fileconverter: refactoring
|
2022-06-09 17:38:27 +03:00 |
|
|
22b341c942
|
fileconverter: added logs
|
2022-06-09 17:02:19 +03:00 |
|
|
9edcce8858
|
moved from ddf515b8
|
2022-06-09 15:11:45 +03:00 |
|
|
7b1ea58cdf
|
fileconverter: moved timer to separete worker service
|
2022-06-08 17:25:25 +03:00 |
|