Commit Graph

7524 Commits

Author SHA1 Message Date
e891f8b6d6 Fixed Bug 57880: Added theme support for download dialog. 2022-06-30 13:14: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
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
TimofeyBoyko
5581aa3039 Web:Files:VirtualRooms: fix fetching rooms if search area and filter doesn exists 2022-06-29 18:09:25 +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
TimofeyBoyko
53311d6308 Web:Files:Article: fix onClick function and active element for docSpace 2022-06-29 18:03:39 +03:00
mushka
3dcc299bd9 fixed ConflictResolve and DeleteAll dialogs 2022-06-29 17:33:37 +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
TimofeyBoyko
4cadd39e19 Merge branch 'feature/virtual-rooms-page' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-page 2022-06-29 16:12:13 +03:00
59e64df2b6 Merge branch 'feature/virtual-rooms-page' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-page 2022-06-29 15:49:57 +03:00
667cea2ee9 Files: fix rooms parent folder 2022-06-29 15:47:52 +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
mushka
81121d5bf9 fix move/copy dialogs 2022-06-28 17:49:47 +03:00
c0ab41b6db Web: Files: Icons: Changed folder icons for all formats (24/32/64/96) 2022-06-28 16:54:15 +03:00
TimofeyBoyko
fd062b7cd6 Web:Files: change docspace to docSpace 2022-06-28 16:36:48 +03:00
TimofeyBoyko
5aaea7d5dc Merge branch 'develop' into feature/virtual-rooms-page 2022-06-28 16:12:33 +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
TimofeyBoyko
a251fab458 Web:Files:Store: update rooms store for room context menu 2022-06-28 13:27:35 +03:00
TimofeyBoyko
9d137ce39a Web:Files:VirtualRooms: add rooms store and context options store 2022-06-28 13:27:01 +03:00
TimofeyBoyko
b7946159e8 Web:Files:Rooms: add rooms store to virtual rooms tile view 2022-06-28 13:25:36 +03:00
TimofeyBoyko
d9e9e28803 Web:Files:Rooms: update table view 2022-06-28 13:25:05 +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
2ab43169a9 Web: Files: Fixed styles for convert dialog and empty trash dialog. 2022-06-28 10:53:34 +03:00
212fc5a405 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-28 10:26:41 +03:00
3ac73beb7e Web: Files: fixed selection of items when clicking on the context menu 2022-06-28 10:26:32 +03:00
dd52a695e5 fix build 2022-06-27 23:18:23 +03:00
75737b8d12 fix Bug 57710 2022-06-27 17:52:56 +03:00
de51c8e1db box: fix GetThumbnail 2022-06-27 16:40:26 +03:00
1b40530107 Fixed Bug 57814 - Client.HotKeys. Fixed setting of hotkey caret 2022-06-27 15:25:34 +03:00
8795b1e377 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-27 14:52:17 +03:00
6117f4b186 Fixed Bug 57781 - Docs: Fixed select items 2022-06-27 14:52:10 +03:00
060c7f371d Web: Files: fixed table selection 2022-06-27 14:48:04 +03:00
6d98440200 az resources 2022-06-27 14:00:23 +03:00
3bcb58999d Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-27 13:46:03 +03:00
5e5b431e07 Fixed Bug 57811, 57812 - Client.Files. Fixed clearing selection when closing context menu. 2022-06-27 13:45:56 +03:00
eda70aef95 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-27 13:54:56 +05:00
9ec801e233 Fixed bug 57697 - Web: Files: added delay for requesting a folder if is viewer mode 2022-06-27 13:54:45 +05:00
b6b65a1941 Fixed Bug 57789 - Mobile. Fixed delete dialog styles 2022-06-27 11:48:03 +03:00
TimofeyBoyko
d7b3af8089 Merge branch 'develop' into feature/virtual-rooms-page 2022-06-26 15:24:13 +03:00
80addf5d86 fixed Bug 57463 2022-06-24 20:41:11 +03:00
f0f4e13633 Fix Bug 57771 - The text color of the hotkeys on the Hotkeys page is not adapted to the dark theme 2022-06-24 18:39:33 +03:00
cb9c8a35a4 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-24 17:55:21 +03:00
4f93505de9 Fix Bug 57777 - Docs: Hotkey Ctrl+A makes pagination block smaller by height 2022-06-24 17:54:33 +03:00
a0852cd105 Web: Files: fixed onSelectItem 2022-06-24 17:54:02 +03:00
6e7675281e Fixed Bug 57779 - Mobile. Fixed buttons styles for dark theme 2022-06-24 17:00:09 +03:00
e8cf4e7906 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-24 16:24:26 +03:00
fef096b0a5 fix generating thumbnails for video 2022-06-24 16:22:52 +03:00
54fa40be47 Fixed Bug 57681 - Client. Removed the checkbox when opening the context menu 2022-06-24 15:51:55 +03:00
30d0ca4b97 Files: added comunity compability 2022-06-24 15:46:59 +03:00
1b6b71b98e Web: Files: disabled hotkeys when version history panel is open 2022-06-24 14:23:07 +03:00
f66309bfed Fixed Bug 57774 - VersionHistory. Added close when Escape button is pressed 2022-06-24 13:12:53 +03:00
f7b4cb89f6 Fixed Bug 57768 - Mobile. Fixed open context menu for IOS devices. 2022-06-24 12:47:16 +03:00
d85c4dac29 fix 2022-06-24 12:15:56 +03:00
09612d377d box: add check can create thumbnail 2022-06-24 11:53:12 +03:00
748d26f2ca Fixed Bug 57769 - Docs: Fixed text selection in HotkeysPanel 2022-06-24 11:05:58 +03:00
d445b9e05d Fix Bug 57753 - badge Revision is not visible clearly on dark theme 2022-06-24 10:44:53 +03:00
TimofeyBoyko
600616b9d9 Web:Files:Article: fix click on root rooms and fix actiove article item 2022-06-23 20:16:17 +03:00
TimofeyBoyko
c651e88681 Web:Files:RoomsStore: correct select root room 2022-06-23 20:15:07 +03:00
TimofeyBoyko
348169e3f4 Merge branch 'feature/room-types' into feature/virtual-rooms-page 2022-06-23 19:40:36 +03:00
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
TimofeyBoyko
4bf70be27d Web:Files: applied changes from 610f738 2022-06-21 14:09:58 +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
mushka
343dd2174c files 2022-06-21 12:42:58 +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
TimofeyBoyko
3f1623716d Web:Files: move global event args to one payload 2022-06-21 11:30:26 +03:00
TimofeyBoyko
7726b8f9ef Web:Files:CreateEvent: add onClose function after user click save button 2022-06-21 11:29:31 +03:00
TimofeyBoyko
c4de30ee0f Web:Files:HOCs: fix warning after removing fileActionStore 2022-06-21 11:28:44 +03:00
TimofeyBoyko
c4483f2892 Merge branch 'develop' into feature/create-from-modal 2022-06-21 11:05:53 +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
TimofeyBoyko
9a58baa435 Web:Files: delete filesActionStore and useless code after adding global events for create and rename file/folder 2022-06-20 19:01:10 +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
TimofeyBoyko
fe4f4ac80d Web:Files:GlobalEvents: delete console log 2022-06-20 15:06:04 +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
TimofeyBoyko
413962bbaa Web:Files:GlobalEvents: add title validation on rename 2022-06-20 12:14:49 +03:00
TimofeyBoyko
efa8a383d7 Web:Files:GlobalEvents: change dialog styles for device width less than 400px 2022-06-20 11:29:47 +03:00
mushka
d4cfd235fc merge with release 2022-06-20 11:25:28 +03:00
TimofeyBoyko
991e3cc012 Web:Files:GlobalEvents: refactoring rename and create events 2022-06-20 11:05:58 +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
TimofeyBoyko
0bfa280c38 Web:Files:FilesActionsStore: fix rename event 2022-06-20 10:34:59 +03:00
e2bdaa40e4 Web: Files: returned set filter url. 2022-06-20 10:30:18 +03:00
TimofeyBoyko
c3620c6c91 Web:Files:Components: add rename and create global events 2022-06-20 10:09:03 +03:00
TimofeyBoyko
a71e637c98 Web:Files:FilesActionsStore: add type as argument to editCompleteAction and change setAction from fileActionStore to global event 2022-06-20 10:08:28 +03:00
TimofeyBoyko
71fea71531 Web:Files:FilesActionsStore: add type as argument to editCompleteAction and change setAction from fileActionStore to global event 2022-06-20 10:07:07 +03:00
TimofeyBoyko
3703693b34 Web:Files:DialogsStore: change create oform file from docx from action store to global event 2022-06-20 10:05:31 +03:00
TimofeyBoyko
fd3a45f301 Web:Files:ContextOptionStore: change rename file or folder from action store to global event 2022-06-20 10:04:33 +03:00
TimofeyBoyko
441786da21 Web:Files:Home: change create oform file from action store to global event 2022-06-20 10:02:48 +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
TimofeyBoyko
ae66c8e4f6 Web:Files:Section:Header: change create file or folder from action store to global event 2022-06-17 16:16:14 +03:00
TimofeyBoyko
10a745c1e6 Web:Files:withHotkeys: change create file or folder from action store to global event 2022-06-17 16:15:54 +03:00
TimofeyBoyko
a029abadf5 Web:Files:EmptyContainer: change create file or folder from action store to global event 2022-06-17 16:00:15 +03:00
TimofeyBoyko
0ab899d5c9 Web:Files: add GlobalEvents component 2022-06-17 15:51:55 +03:00
TimofeyBoyko
1a34e82155 Web:Files:Article: change create file or folder from action store to global event 2022-06-17 15:49:29 +03:00
080cde2888 Web: Files: Fix empty second line of FileRowContent on third-party folders 2022-06-17 15:39:45 +03:00
TimofeyBoyko
bac023f04c Web:Files:Constants: add global events name 2022-06-17 14:54:17 +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