Commit Graph

21773 Commits

Author SHA1 Message Date
5d4715e674 fix 2022-07-01 17:37:09 +03:00
e3e12b902f
Merge pull request #584 from ONLYOFFICE/feature/LDAP-new
Feature/LDAP-new
2022-07-01 14:50:32 +03:00
a289f9594a modified LdapNotifyHelper to BackgroundService 2022-07-01 14:49:59 +03:00
329ec57aa2 Merge branch 'develop' into feature/LDAP-new 2022-07-01 13:15:52 +03:00
7e34e45371 ElasticSearch: disabled by default 2022-07-01 12:53:18 +03:00
f24fc8e19e fix 2022-06-30 17:12:49 +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
9eba532a8d
Merge pull request #705 from ONLYOFFICE/bugfix/fix-folder-security
bugfix/fix-folder-security
2022-06-30 12:51:24 +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
4cd132f80b Web: Components: fix warnings 2022-06-30 11:37:08 +03:00
f56a40435e Web: add missed icons 2022-06-30 11:34:54 +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
adc789eaf6
Merge pull request #694 from ONLYOFFICE/feature/get-thumbnail-from-thirdparty
Feature/get thumbnail from thirdparty
2022-06-29 20:55:27 +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
00359fa4cc
Merge pull request #703 from ONLYOFFICE/fix/order_endponts
fix order endpoints
2022-06-29 19:44:11 +03:00
35ab5a3531 fix order 2022-06-29 19:43:29 +03:00
9bea14405c Merge branch 'develop' into fix/order_endponts 2022-06-29 18:45:50 +03:00
d78509993f fixed Bug 53280 2022-06-29 18:40:35 +03:00
94224eb6c3
Merge pull request #704 from ONLYOFFICE/feature/delete_expired_service
first version: delete expired service
2022-06-29 18:35:20 +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
46acfbca6d Fixed Bug 57769 - Docs: fixed banner selection 2022-06-29 17:47:10 +03:00
0268d807c2 Fix Bug 57863: errors in console when press enter repeatedly 2022-06-29 17:22:57 +03:00
4af504a7aa Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-29 17:17:30 +03:00
605c78f5dd Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-29 17:16:18 +03:00
11e4595939 Fix bug: the site header shifts if you open the keyboard on an android phone 2022-06-29 17:16:09 +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
21f8cb54a1 Fixed Bug 57842: Components: Added a different svg color for the dark theme. 2022-06-29 16:16:51 +03:00
b807959aa8 Fix Bug 57853: audio files can't open 2022-06-29 15:42:21 +03:00
5f6851253f fix bug 57725 2022-06-29 15:10:56 +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