Commit Graph

7288 Commits

Author SHA1 Message Date
TimofeyBoyko
fff7dd7646 Web:Files:Store: add rooms store 2022-06-23 19:38:01 +03:00
f2bf9defe6 Files: added property room type in dto 2022-06-23 18:39:00 +03:00
a035e9bf0c
Merge pull request #696 from ONLYOFFICE/feature/download-dialog
Feature/download dialog
2022-06-23 15:41:47 +03:00
9408a5a296 Web: Files: Added and applied new "ErrorInternalServer" translation key to Common.json 2022-06-23 15:34:52 +03:00
67f276e0d0 Fixed Bug 57763 - Сlient.OformsGallery. Fixed form creation after back from form gallery page 2022-06-23 15:19:17 +03:00
20deb4458a thumbnails: adaptive size 2022-06-23 15:18:15 +03:00
4b513bef15 Fixed Bug 57743 - Client.Upload. Added warning about possible data loss when refreshing the page while loading files/folders 2022-06-23 14:03:03 +03:00
d98a151385 Merge branch 'release/v1.2' into feature/download-dialog 2022-06-23 12:28:13 +03:00
3bf29d925c Web: Files: Fix decrement of root folder counter by click on 'New' file status 2022-06-23 12:26:10 +03:00
af252cc949 fix 2022-06-23 12:24:20 +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
TimofeyBoyko
d49b5afb98 Web:Files:Article: remove useless code 2022-06-22 17:33:23 +03:00
TimofeyBoyko
07c34da64d Web:Files: change virtual rooms page url 2022-06-22 17:33:10 +03:00
ed2298663c Web: Files: Added opportunity to turn off "New" files badge 2022-06-22 17:25:26 +03:00
TimofeyBoyko
c20c47921e Web:Files:Article: send rootFolderType as type at catalog item 2022-06-22 17:21:57 +03:00
b9496e4d0b Merge branch 'release/v1.2' into feature/download-dialog 2022-06-22 17:21:38 +03:00
TimofeyBoyko
4023e101bd Web:Files:Store applied e2bdaa4 2022-06-22 16:27:30 +03:00
478666331b fix bug 57463 2022-06-22 16:26:38 +03:00
TimofeyBoyko
fdbe61603b Web:Files:Article: add empty accounts item 2022-06-22 16:24:18 +03:00
d05f13b143 fix 2022-06-22 16:21:39 +03:00
TimofeyBoyko
073c24014a Web:Files:Article: add new header items: files, rooms, other 2022-06-22 16:14:42 +03:00
914c9bc799 File: fix download 2022-06-22 15:54:43 +03:00
274e89f51c Web: Files: added limit for download action 2022-06-22 15:38:05 +03:00
5e4d065623 Fixed Bug 57720 - Client. Fixed display the current directory 2022-06-22 14:58:34 +03:00
5cb96c0727 Merge branch 'release/v1.2' into feature/download-dialog 2022-06-22 14:32:57 +03:00
TimofeyBoyko
40d69ea88f Web:Files:Article: rename SettingsItems to SettingItem 2022-06-22 14:20:27 +03:00
TimofeyBoyko
6c6052293b Web:Files:Article: change default icon to settings item 2022-06-22 14:17:35 +03:00
TimofeyBoyko
ceaa29e294 Web:Files:Article: hide thirparty list, download app list and banner for docspace 2022-06-22 14:17:07 +03:00
2273887a6a Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-22 14:11:19 +03:00
cd2687e260 Fixed Bug 57630: Web: Files: Fixed animation when switching between folders. 2022-06-22 14:11:07 +03:00
de7148686c fix Bug 52860 2022-06-22 13:48:11 +03:00
TimofeyBoyko
4b7520c6a8 Web:Files:Article: add new icons for article items 2022-06-22 12:32:21 +03:00
1658240e2f Web: Files: fixed download action 2022-06-22 12:07:57 +03:00
b88dadf961 Merge branch 'feature/download-dialog' of github.com:ONLYOFFICE/AppServer into feature/download-dialog 2022-06-22 11:53:01 +03:00
f84d98c6df Web: Files: fixed downloadFiles toast 2022-06-22 11:52:37 +03:00
7189a99583 Merge branch 'feature/download-dialog' of https://github.com/ONLYOFFICE/AppServer into feature/download-dialog 2022-06-22 11:36:35 +03:00
3b99ef503c Merge branch 'release/v1.2' into feature/download-dialog 2022-06-22 11:36:20 +03:00
TimofeyBoyko
36835eea13 Merge branch 'develop' into feature/virtual-rooms-page 2022-06-22 11:17:05 +03:00
f2da6fc55c
Merge pull request #693 from ONLYOFFICE/feature/docspace
Feature/docspace
2022-06-22 11:55:36 +04:00
417b13b844 Fix Bug 57704: left/right arrow select item in compact view 2022-06-21 22:09:40 +03:00
7f77633a92 Fix Bug 57639: different actions menu 2022-06-21 21:41:29 +03:00
aad8a92b4c RoomInvite replaced by LinkInvite 2022-06-21 20:33:05 +03:00
bbcd5b7382 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-21 19:45:30 +03:00
95c23cc95a Fix Bug 57680 - Mobile. Couldn't not select more than 1 tile in thumbnails mode 2022-06-21 19:45:16 +03:00
b30ec3c1bd Files: added room api docs 2022-06-21 18:43:54 +03:00
231c99a5f0 fix Bug 57693 2022-06-21 17:52:32 +03:00
1aadf26fe2 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-21 17:05:04 +03:00
fa3b7003ba Fixed Bug 57701 - Client.HotKeys. Fixed the creation of the document 2022-06-21 16:49:30 +03:00
8ad241fc6d Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-21 16:21:47 +03:00
9c1eb1e185 Fixed Bug 57683 - Client.Info. Hidden "Content" field for third-party folders 2022-06-21 16:21:07 +03:00
aaf331557e Fixed Bug 57646: Web: Files: Added the ending of file/folder creation 2022-06-21 16:07:21 +03:00
14eb735fed Fixed Bug 57642 - Docs: Actions: Fixed form template creation after resizing window to tablet size 2022-06-21 14:10:01 +03:00
6f0fa1555f Web: Files: Removed static description from GalleryForm item info 2022-06-21 13:23:50 +03:00
66cdf0bdaf Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-21 13:03:31 +03:00
610f738ca6 Web: Files: Fix password protected files operations 2022-06-21 12:29:26 +03:00
a4d33b9939 Fixed Bug 57660 - Docs: Fixed display info-panel content for forms-gallery 2022-06-21 12:19:15 +03:00
494b2bc1e0 merge 2022-06-21 10:53:05 +03:00
0a27a98511 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-21 10:52:53 +03:00
18f944b2c6 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-21 10:10:12 +03:00
b2f9e35041 Fixed Bug 57663: Client: Files: Fixed displaying icons for connecting accounts 2022-06-20 22:42:48 +03:00
fc567a1040 Fixed Bug 57637: Client: Files: Fixed icon size for editing item 2022-06-20 22:09:36 +03:00
72f0ac4f9b file converter server: fixed bugs 2022-06-20 19:58:08 +03:00
c3faf982c5 Files: fix download 2022-06-20 18:29:07 +03:00
aa53acccd9 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-20 17:54:19 +03:00
fa458aa1a5 Web: Files: fixed selection when clicking on badge or file/folder name 2022-06-20 17:54:14 +03:00
e0a23a91a3 Web: Files: added error on download action 2022-06-20 17:50:32 +03:00
5ac3d3e5b6 Web: Files: added new logic when select file format 2022-06-20 17:28:55 +03:00
34cb63fd3f fix 2022-06-20 17:23:32 +03:00
5a06f23111 fix Bug 57618 2022-06-20 17:14:37 +03:00
03e756277b fixed warnings 2022-06-20 17:01:59 +03:00
ac94309716 Web: Files: removed custom format from download dialog selector 2022-06-20 16:55:21 +03:00
3b5cb1b7fe Web: Files: fixed display of items in download dialog 2022-06-20 16:33:05 +03:00
c192e0fd0a Merge branch 'release/v1.2' into feature/download-dialog 2022-06-20 15:41:53 +03:00
79cce9cfc1 Web: Files: Added file ext after update date on File Row view mode 2022-06-20 15:35:27 +03:00
a8bf285dc1 Web: Files: Added and applied new modern row mode 2022-06-20 15:01:54 +03:00
57916d46ba Files: removed unnecessary, refactor 2022-06-20 14:39:08 +03:00
44747e837a Files: tag id replaced with tag name 2022-06-20 14:30:49 +03:00
2eb288f307 Web: Files: removed comments 2022-06-20 14:28:10 +03:00
9e99fed6b5 Web: Files: added new DownloadDialog, refactoring 2022-06-20 14:18:40 +03:00
231daa2e0b Web: removed useless translations 2022-06-20 14:16:11 +03:00
e6602a22ab Files: fix copyas 2022-06-20 13:21:40 +03:00
e68ac70005 Merge branch 'develop' into feature/docspace 2022-06-20 12:15:08 +03:00
efba3d824e Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-20 11:04:43 +03:00
e2bdaa40e4 Web: Files: returned set filter url. 2022-06-20 10:30:18 +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
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
c83bd81bd5 Web: Files: Styled table badge (more closer to figma) 2022-06-17 18:21:16 +03:00
080cde2888 Web: Files: Fix empty second line of FileRowContent on third-party folders 2022-06-17 15:39:45 +03:00
29d3bb3fee Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-17 13:18:03 +03:00
597db4684e refactoring 2022-06-17 13:17:53 +03:00
3684775829 Files: security fix 2022-06-17 12:27:07 +03:00
ff6a403c3c Files: refactor 2022-06-17 11:22:55 +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
2b8b7c9898 Files: added permission check for link generation 2022-06-17 10:59:03 +03:00
1f65ea35a7 Files: removed unnecessary 2022-06-17 10:52:32 +03:00
09de3c141c Web: Files: Deleted useless code. 2022-06-17 10:31:38 +03:00
0fbe11ed1c Merge branch 'develop' into feature/docspace 2022-06-17 10:26:51 +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
34d55db6a6 Files: added invitation by link without email, added existing user to room by link 2022-06-16 18:39:50 +03:00
fc93c6336a Files: added email invitation 2022-06-16 18:34:38 +03:00
d3890b3e18 Files: deleted unnecessary 2022-06-16 18:28:15 +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
0d1239af95 add thumbnails for video 2022-06-16 16:43:29 +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
77ecf6f988 Files: fix 2022-06-14 18:12:37 +03:00
TimofeyBoyko
52d9f7f20f Web:Files:init virtual rooms page with empty container and table and tile views 2022-06-14 16:41:26 +03:00
TimofeyBoyko
0746b20089 Web:Files: add context options for virtual rooms page 2022-06-14 16:34:07 +03:00
TimofeyBoyko
668ac51998 Web:Files: add new pin and settings images 2022-06-14 16:30:41 +03:00
7194fec848 Files: fix 2022-06-14 13:30:12 +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
c2b7f99f16 refactoring get thumbnailFile 2022-06-14 10:45:52 +03:00
722f3568bb refactoring get ThumbnailFile 2022-06-14 10:28:57 +03:00
a98eb791e8 Files: refactor 2022-06-14 01:33:37 +03:00
de36de1870 Files: fix 2022-06-14 00:04:45 +03:00
269cdd9825 Files: refactor 2022-06-13 21:50:49 +03:00
f68585bf9d Files: fix 2022-06-13 21:04:51 +03:00
3e2483a016 Files: added rooms folder cache clearing 2022-06-13 17:41:13 +03:00
5be6e7cbee Files: fix 2022-06-13 17:40:34 +03:00
2336dc9762 Files: refactor 2022-06-13 17:40:25 +03:00
239d1803c7 FIles: refactor 2022-06-13 17:32:24 +03:00
e618f7f450 Files: fix filter, added clearing rooms cache 2022-06-10 22:32:21 +03:00
d370c797bb Files: added virtual rooms default share 2022-06-10 22:31:24 +03:00
2811e694c6 Files: fix System.NullReferenceException 2022-06-10 22:30:49 +03:00
7fdf89ecae Files: added thirdparty rooms tags query 2022-06-10 22:30:28 +03:00
d43693acb2 get status Thumbnail.Created for thirdparty 2022-06-10 16:06:32 +03:00
7ddb0506c9 Web: Files: moved Hotkeys translation, added button to open hotkeys 2022-06-10 11:30:57 +03:00