|
|
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 |
|
|
|
0f3da31811
|
Files: fix
|
2022-06-30 12:43:38 +03:00 |
|
|
|
5edde068f7
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-30 12:18:24 +03:00 |
|
|
|
a7456fa89b
|
Fixed Bug57856: Removed delete button from media-viewer in the favorite folder.
|
2022-06-30 12:16:50 +03:00 |
|
|
|
630250b439
|
fix tests
|
2022-06-30 12:07:30 +03:00 |
|
|
|
10a3edec61
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-30 11:46:34 +03:00 |
|
|
|
32433e10e1
|
Fix Bug 57876: blocked files while deletion is in progress
|
2022-06-30 11:45:18 +03:00 |
|
|
|
ec90de13c6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-30 11:28:28 +03:00 |
|
|
|
e972c06d22
|
Web:Files:Added isTrashFolder.
|
2022-06-30 11:28:15 +03:00 |
|
|
|
6b2f643441
|
Fix Bug 57852: add flags for languages combo
|
2022-06-30 11:25:20 +03:00 |
|
|
|
8624e75c30
|
Fix Bug 57875: white row when create file
|
2022-06-30 11:13:58 +03:00 |
|
|
|
f4d9b4dd3a
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-30 11:05:04 +03:00 |
|
|
|
e64b4a46ac
|
Web:Files:Removed the ability to create and upload files and folders in the Favorites, Recent, Trash folders.
|
2022-06-30 11:03:53 +03:00 |
|
|
|
8f9c8b4c1b
|
Fix Bug 57836: add clear trash button
|
2022-06-30 02:48:52 +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 |
|
|
|
35ab5a3531
|
fix order
|
2022-06-29 19:43:29 +03:00 |
|
|
|
d78509993f
|
fixed Bug 53280
|
2022-06-29 18:40:35 +03:00 |
|
|
|
5ccd9d01a5
|
DeleteExpiredService: launch frequency
|
2022-06-29 18:34:50 +03:00 |
|
|
|
517eefe3ab
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 18:07:25 +03:00 |
|
|
|
b52b31eaae
|
Web:Files:Changed button name to "Remove from favorites".
|
2022-06-29 18:07:13 +03:00 |
|
|
|
bbf7065532
|
Fixed Bug 53879 - Client: Check box. Fixed file selection reset after adding new icons
|
2022-06-29 18:05:53 +03:00 |
|
|
|
0268d807c2
|
Fix Bug 57863: errors in console when press enter repeatedly
|
2022-06-29 17:22:57 +03:00 |
|
|
|
f8dd154c88
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 17:11:24 +03:00 |
|
|
|
ceb4a5491a
|
Web:Files:Fixed deleting files in the Recycle Bin using the Delete button from the Favorites and Recent folders.
|
2022-06-29 17:10:09 +03:00 |
|
|
|
b807959aa8
|
Fix Bug 57853: audio files can't open
|
2022-06-29 15:42:21 +03:00 |
|
|
|
be08c35421
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 14:55:45 +03:00 |
|
|
|
53fe0a309a
|
Fix Bug 57848 - Client.Clouds. Non-obvious button to go to the third-party storage folder from the Connected Clouds page.
|
2022-06-29 14:55:39 +03:00 |
|
|
|
f417477cae
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 14:46:28 +03:00 |
|
|
|
b407da3bd2
|
Fixed Bug 57860 - Client.Files. ‘Something went wrong’ when clicking on the share icon after selected a row.
|
2022-06-29 14:46:20 +03:00 |
|
|
|
067a614c2b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 14:32:40 +03:00 |
|
|
|
228258707a
|
Web:Files:Added displayType="modal" for EmptyTrashDialog.
|
2022-06-29 14:32:23 +03:00 |
|
|
|
21ea7ec019
|
first version: delete expired service
|
2022-06-29 11:55:54 +03:00 |
|
|
|
8f8041a31b
|
Web: Files: fixed download-dialog styles
|
2022-06-29 11:38:59 +03:00 |
|
|
|
e1b6d5000b
|
filedownloadoperation: added try/catch block
|
2022-06-28 18:35:26 +03:00 |
|
|
|
c0ab41b6db
|
Web: Files: Icons: Changed folder icons for all formats (24/32/64/96)
|
2022-06-28 16:54:15 +03:00 |
|
|
|
24d2672073
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 16:09:24 +03:00 |
|
|
|
abeec34451
|
Web: Files: Actions: Added icons for menu sublevels
|
2022-06-28 16:09:14 +03:00 |
|
|
|
9e42ee80b2
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into release/v1.2
|
2022-06-28 15:52:30 +03:00 |
|
|
|
21b2735147
|
filedownloadoperation: restore processed and progress fields
|
2022-06-28 15:52:21 +03:00 |
|
|
|
4684f26299
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 15:39:40 +03:00 |
|
|
|
08090ea3b4
|
Web: Icons: Fixed icon bundle for items menu and folders menu
|
2022-06-28 15:39:31 +03:00 |
|
|
|
fd7a6f9ee9
|
Web: Files: Hotkeys: fixed table-header styles
|
2022-06-28 15:34:20 +03:00 |
|
|
|
d1063df40c
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-28 15:32:06 +03:00 |
|
|
|
5cc38b95df
|
add fFmpegFormats and imageFormatsCanBeCrop
|
2022-06-28 14:39:20 +03:00 |
|
|
|
8b6b3c75e1
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 12:45:57 +03:00 |
|
|
|
167a6b0db6
|
Fixed Bug 57770 - Client.Profile. Fixed display of the current theme after saving the profile
|
2022-06-28 12:45:49 +03:00 |
|
|
|
ccf7953a2d
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 12:30:01 +03:00 |
|
|
|
d9b640450e
|
Fix Bug 57825 - Client.Files.AsNew. New badge do not disappear on 'Mark all as read' button click
|
2022-06-28 12:29:55 +03:00 |
|
|
|
561a0bba71
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 10:53:40 +03:00 |
|
