|
|
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 |
|
|
|
72b0a81f51
|
fix
|
2022-06-17 20:51:01 +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 |
|
|
|
080cde2888
|
Web: Files: Fix empty second line of FileRowContent on third-party folders
|
2022-06-17 15:39:45 +03:00 |
|
|
|
fa9316807c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-17 11:15:51 +03:00 |
|
|
|
06ce968e9f
|
Web: Files: fixed edit component styles
|
2022-06-17 11:15:32 +03:00 |
|
|
|
09de3c141c
|
Web: Files: Deleted useless code.
|
2022-06-17 10:31:38 +03:00 |
|
|
|
b62ba1d729
|
fix tests
|
2022-06-17 10:17:17 +03:00 |
|
mushka
|
930b05fc31
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-16 19:01:53 +03:00 |
|
mushka
|
776a37f538
|
changed InfoPanel behaviour on module switch + added InfoPanelLoader components + changed the way how InfoPanelHeader passed itself to Section + united GalleryHeader and InfoPanelHeader to one component
|
2022-06-16 19:01:30 +03:00 |
|
|
|
67b9a00068
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-16 17:23:09 +03:00 |
|
|
|
b26c2a8a6f
|
edit VersionHistory.json
|
2022-06-16 17:21:42 +03:00 |
|
|
|
e9a1220c0e
|
Web: Files: fixed oforms creation
|
2022-06-16 17:18:04 +03:00 |
|
|
|
56ece27e1b
|
moved from ddf515b8
|
2022-06-16 17:16:46 +03:00 |
|
TimofeyBoyko
|
0317a4f4a3
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-16 16:41:49 +03:00 |
|
TimofeyBoyko
|
7b2fe1790c
|
Web:Files:EditingWrapperComponent: fix dark theme for tile view
|
2022-06-16 16:41:33 +03:00 |
|
|
|
d3bb2419c1
|
Web: Files: fixed oforms creation, added display oforms gallery button for all languages
|
2022-06-16 16:15:01 +03:00 |
|
|
|
83d9e01d04
|
Web: Files: fixed header jumping for mobile devices
|
2022-06-16 13:39:36 +03:00 |
|
|
|
f2e2ccee72
|
Web: Files: Header: refactoring
|
2022-06-16 13:28:38 +03:00 |
|
|
|
1ac2e80310
|
Web: Files: fixed download dialog styles
|
2022-06-16 12:29:50 +03:00 |
|
|
|
8c8bef2418
|
Web: Files: fixed finalizeVersionAction
|
2022-06-16 12:03:47 +03:00 |
|
|
|
430542b2ea
|
moved from ddf515b8
|
2022-06-16 11:35:24 +03:00 |
|
|
|
c9fb0d3dac
|
moved from ddf515b8
|
2022-06-16 11:13:53 +03:00 |
|
|
|
a98e5d9c6a
|
Web: Files: Fix display name decoding ('Shared With Me' Author column issue)
|
2022-06-15 19:49:18 +03:00 |
|
|
|
3a6eb0c8de
|
Web: Files: removed table-row z-index
|
2022-06-15 17:25:53 +03:00 |
|
|
|
59f50effc5
|
Merge branch 'develop' into bugfix/fix-private-room
|
2022-06-15 14:48:49 +03:00 |
|
mushka
|
78cdd52e94
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-15 14:25:45 +03:00 |
|
mushka
|
f2d7a02288
|
added decoding for unicode characters in InfoPanel
|
2022-06-15 14:25:33 +03:00 |
|
|
|
f3f3ed96ae
|
moved from ddf515b8
|
2022-06-15 12:46:21 +03:00 |
|
|
|
c37af416da
|
Files: fix 404
|
2022-06-15 10:41:59 +03:00 |
|
|
|
d4622ee902
|
Web: Files: added error handling for create/edit operations
|
2022-06-14 12:51:54 +03:00 |
|
|
|
35bebe49f9
|
moved from ddf515b8
|
2022-06-14 11:11:41 +03:00 |
|
|
|
7ddb0506c9
|
Web: Files: moved Hotkeys translation, added button to open hotkeys
|
2022-06-10 11:30:57 +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 |
|
Artem Tarasov
|
885ab9b041
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-09 13:05:48 +03:00 |
|
Artem Tarasov
|
67ec336b60
|
Web: Files: changed setSelection to setBufferSelection when scroll to item
|
2022-06-09 13:05:29 +03:00 |
|
Artem Tarasov
|
2aa0bc254a
|
Web: Files: fixed selector
|
2022-06-09 11:03:06 +03:00 |
|
|
|
95e7d85c53
|
Fixed Bug 57445: Client: Files: Added property to restore selection after fetching items
|
2022-06-09 10:44:13 +03:00 |
|
Artem Tarasov
|
c28a513a9a
|
Web: Files: fixed scroll to item for table view
|
2022-06-09 10:24:00 +03:00 |
|
Artem Tarasov
|
dccd09dd89
|
Web: Files: added prop 'id' for list items
|
2022-06-09 10:23:02 +03:00 |
|
Artem Tarasov
|
2ca378643d
|
Web: Files: added scroll to the created file and to the last opened image
|
2022-06-09 01:22:50 +03:00 |
|
|
|
7b1ea58cdf
|
fileconverter: moved timer to separete worker service
|
2022-06-08 17:25:25 +03:00 |
|
|
|
02b4031ba0
|
fix Bug 57463
|
2022-06-08 12:53:33 +03:00 |
|
|
|
5203feffe7
|
Web: Files: added table loader
|
2022-06-07 16:15:55 +03:00 |
|
Artem Tarasov
|
cec8eeeff1
|
Web: Files: Fixed Bug 57442 - Client.Block: disabled lock/unlock action for non-editable formats
|
2022-06-07 10:04:33 +03:00 |
|
|
|
161ef0f1f9
|
Web: Files: fixed withFileActions re-render, removed tiles log
|
2022-06-06 18:11:53 +03:00 |
|
mushka
|
dced443306
|
removed unused get func from SettingsStore
|
2022-06-06 18:04:16 +03:00 |
|
|
|
8c56de7a26
|
moved from ddf515b8
|
2022-06-05 18:44:37 +03:00 |
|
