Commit Graph

5653 Commits

Author SHA1 Message Date
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
ed2298663c Web: Files: Added opportunity to turn off "New" files badge 2022-06-22 17:25:26 +03:00
b9496e4d0b Merge branch 'release/v1.2' into feature/download-dialog 2022-06-22 17:21:38 +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
cd2687e260 Fixed Bug 57630: Web: Files: Fixed animation when switching between folders. 2022-06-22 14:11:07 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
d4622ee902 Web: Files: added error handling for create/edit operations 2022-06-14 12:51:54 +03:00
7ddb0506c9 Web: Files: moved Hotkeys translation, added button to open hotkeys 2022-06-10 11:30:57 +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
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
9f74ef2bc3 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-03 15:16:34 +03:00
ff118752ed Web: Files: Fixed memory leak after resize. 2022-06-03 15:16:19 +03:00
efcf805aec Web: Files: fix show paging 2022-06-03 14:46:23 +03:00
0eade93e81 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-03 14:25:47 +03:00
f0363e6a81 Web: Files: Removed hover border overlay on hotkey border in table view. 2022-06-03 14:25:32 +03:00
4e7e9415d9 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-03 13:38:17 +03:00
493a7eb39b Fixed Bug 57469 - Client.Files.Upload. "Something went wrong" when opening the upload panel. 2022-06-03 13:38:11 +03:00
dfd595193d Fix Bug 57383: open editor when created form 2022-06-03 13:37:02 +03:00
da4bdc89cd Web: Files: Added a default cursor for files in the folder selection dialog. 2022-06-03 12:56:39 +03:00
e594cdaf4d Web: Files/Components: Fixed dark theme of files icons for selection folder dialog. 2022-06-03 12:53:12 +03:00
bbf1a0cbfa Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-03 12:19:49 +03:00
def3db7860 Web: Files: Return bad code after merge. 2022-06-03 12:19:26 +03:00
00a2bfa884
Merge pull request #686 from ONLYOFFICE/bugfix/field-created-on-file
Bugfix/field created on file
2022-06-03 12:03:40 +03:00
d221e4dca2 Web: Files/Components: Added restriction on moving a folder into itself 2022-06-03 11:37:30 +03:00
85bb4df966 edit translations 2022-06-02 18:41:50 +03:00
e2d047ad54 Fix Bug 57447: active restore button in trash 2022-06-02 17:12:52 +03:00
8079b217ac Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-02 17:06:21 +03:00
db238ffedb update lo 2022-06-02 17:03:42 +03:00
30ae545e6f Fix Bug 57443: layering icon over text 2022-06-02 14:19:18 +03:00
34028b0990 Fixed Bug 57414 - Client.Upload. Fixed file extension display after upload and conversion 2022-06-02 13:46:30 +03:00
2b63336d62 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-02 13:22:46 +03:00
e2d39453f8 edit translations 2022-06-02 13:21:37 +03:00
fa3aca4a3e Web: Files: removed group sharing for personal 2022-06-02 11:25:01 +03:00
d38d88c0ea Fixed Bug 54591 - Client.Files. Fixed deleting third party files/folders toast. 2022-06-02 11:12:19 +03:00
146891713d Web: Files: fixed group context menu 2022-06-01 18:15:52 +03:00
19d9a258b9 Merge branch 'release/v1.2' into feature/group-context-menu 2022-06-01 17:48:36 +03:00
f070c50c63 Web: Files: added clear selection after mark as favorite 2022-06-01 17:39:08 +03:00
cbcb8f903a Web: Files: combined add to favorites / remove from favorites in a single block 2022-06-01 17:14:54 +03:00
b8162f4af7 Web: Files: removed count of files from group context menu label 2022-06-01 17:06:54 +03:00
9467a7e366 Web: Files: added separators to group context menu, remove empty trash 2022-06-01 16:54:32 +03:00
6c04530f20 Web: Files: Delete useless translation. 2022-06-01 16:19:59 +03:00
229a6e8f0d Merge branch 'release/v1.2' into bugfix/field-created-on-file 2022-06-01 17:40:32 +05:00
9df538e4b5 Web: Files: fixed setSelected 2022-06-01 15:30:18 +03:00
8af30212aa Web: Files: added group context options 2022-06-01 15:13:09 +03:00
36fd7e6e0c Web: Files: removed useless code 2022-06-01 13:23:59 +03:00
aef79ffbe7 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-01 12:34:01 +03:00
76c4d2ebfc Web: Fixed color in dark theme for dialog. 2022-06-01 12:33:49 +03:00
Timofey Boyko
ff9c0f54ae Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-01 11:56:31 +03:00
Timofey Boyko
af00060711 Fix Bug 57426 - Client. Folder name tooltip at cursor position when navigation bar is open 2022-06-01 11:56:21 +03:00
e7650b126b Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-01 10:51:41 +03:00
e24891953e Web: Files: Fixed border color of header of upload panel. 2022-06-01 10:51:30 +03:00
Timofey Boyko
7efeeabe1b Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-01 10:41:22 +03:00
Timofey Boyko
5e78699844 Web:Files:FormGallery: fix interface jumping when info panel is open 2022-06-01 10:40:59 +03:00
141ee254e6 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-01 12:21:46 +05:00
90da8a3fa1 Fix bug 57415 - Web: Files: fixed clear uploaded files history 2022-06-01 12:21:34 +05:00
4c2064714d Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-31 18:38:13 +03:00
8b1facfcae edit translations 2022-05-31 18:37:00 +03:00
mushka
aaff52299b Fix InfoPanelToggleWrapper in FormGallery on desktop 2022-05-31 15:48:42 +03:00
fa38dad158
Merge pull request #681 from ONLYOFFICE/feature/info-panel-store-relocation
InfoPanelStore relocation
2022-05-31 15:29:42 +03:00
mushka
cf01904b94 fixed GalleryHeader`s InfoPanelToggle on tablet and mobile 2022-05-31 14:14:10 +03:00
Timofey Boyko
12702e0b57 Web:Files:TableView: increase z-index for hover row 2022-05-31 13:50:04 +03:00
Timofey Boyko
0b252d79a6 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-31 13:24:34 +03:00
Timofey Boyko
55515ded68 Fix Bug 57407 - Client.OformsGallery. Something went wrong when template info opened 2022-05-31 13:24:21 +03:00
mushka
7d327bd9f7 removed infoPanelStore from hotkeyStore 2022-05-31 13:15:54 +03:00
478d4a429c Web: Client: Files: Fixed displaying rename action on editing third party item 2022-05-31 12:27:21 +03:00
Timofey Boyko
ce0fca842b Fix Bug 54569 - Client.Files. Switch tab automatically completes the creation of the file 2022-05-31 12:24:13 +03:00
cca2e4aa1f Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-31 09:37:21 +03:00
056fe260cd Web: Files: Removed scroll sticking if you try to move the scroll slider. 2022-05-31 09:37:06 +03:00
7d98feae07 Web: Files: Commented console logs 2022-05-30 19:32:38 +03:00
461e628c59 Web: Files: Fix upload on DnD to Catalog 2022-05-30 19:13:17 +03:00
02e08d8097 Web: Files: Fix issues with parallel uploads (empty folders + files) 2022-05-30 18:28:01 +03:00
a4f412ee89 Merge branch 'release/v1.2' into feature/upload-empty-folders 2022-05-30 17:36:42 +03:00
4b35b21b6e Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-30 16:29:13 +03:00
69dceb030a Fix Bug 57375: cancel uploads 2022-05-30 15:51:52 +03:00
299e776a66 Fixed Bug 57376 - Client.Upload. The previous list of downloaded files is displayed on the download panel after it is closed 2022-05-30 15:44:50 +03:00
5a26c4f404 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-30 15:33:17 +03:00
68cbced3d0 Web: Files: Removed file offset when selecting them. (macOS, Safari) 2022-05-30 13:58:10 +03:00
mushka
b20d37c22e relocated InfoPanelStore from Files to Common.Auth 2022-05-30 13:46:45 +03:00
5a98f14cc7 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-30 13:30:31 +03:00
2119e35224 Web: Files: Removed additional borders on the left and right in the table view (macOS, Safari). 2022-05-30 13:28:59 +03:00
d8e48dca88 Web: Files: Added showing of empty folder creation progress 2022-05-27 22:22:20 +03:00
10091ac5d1 Web: Files: Added empty folder tree creation on DropZone upload only 2022-05-27 20:50:32 +03:00
bb64f104c5 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-27 17:26:10 +03:00
e1e021f3fa edit translations 2022-05-27 17:25:03 +03:00
717dac9e69 Web: Files: added lastModifiedDate to start upload session 2022-05-27 18:21:59 +05:00
19aacaa69c Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-27 16:19:49 +03:00
da19e06d1f Web: Files: Hotkeys: fixed arrow key events 2022-05-27 16:19:43 +03:00
2d72dcf337 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-27 16:15:16 +03:00
4d02251c6b edit translations 2022-05-27 16:14:45 +03:00
mushka
5ad2231fc3 Merge branch 'release/v1.2' into feature/modal-redesign 2022-05-27 15:24:29 +03:00
881a70a540 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-27 14:58:43 +03:00
c092ae1d13 Fixed Bug 57327: Wrong size of icon on mobile shortcut 2022-05-27 14:58:32 +03:00
7acd9e894f Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-27 14:11:20 +03:00
98903043e6 Fix Bug 57353: hide version history for media 2022-05-27 14:11:06 +03:00
bb7871abad Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-27 14:09:34 +03:00
a16b2c7927 edit translations 2022-05-27 14:08:27 +03:00
8a48a64d02 Web: Files: Tile: fix context menu crash 2022-05-27 13:14:29 +03:00
a7c5e5cb5e Web: Files: fix tile check logic 2022-05-27 13:04:38 +03:00
e6e7afd1f7 Web: Files: Hotkeys: fixed lagging 2022-05-27 12:02:06 +03:00
515c401914 Merge branch 'release/v1.2' into feature/upload-empty-folders
# Conflicts:
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	yarn.lock
2022-05-27 11:05:36 +03:00
470c983e2e Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 21:46:36 +03:00
04e5a83e8e Web: Files: Tile: fix tile check 2022-05-26 21:45:51 +03:00
Timofey Boyko
63d4de9ee9 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 21:18:36 +03:00
Timofey Boyko
335d344cb4 Web:Files:Home: add check for empty column before set dropbbable-hover class 2022-05-26 21:18:27 +03:00
Timofey Boyko
2ad3a2fa6e Web:Files:TableView: fix bug with wrong background for empty column with drag and drop 2022-05-26 21:17:49 +03:00
Timofey Boyko
8710b8b4b8 Web:Files:TableView: move storage names from table header to table container component 2022-05-26 20:03:24 +03:00
325a53579a Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-26 19:22:45 +03:00
032191f542 edit translations 2022-05-26 19:22:25 +03:00
437808b6bd Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 18:07:41 +03:00