Commit Graph

7615 Commits

Author SHA1 Message Date
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
Artem Tarasov
2eebeb3c1a Merge branch 'develop' into feature/doceditor-ssr 2022-06-14 11:22:23 +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
1b6d96400c Files: changed filtering rooms by types 2022-06-09 20:11:12 +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
16b5a4cac8 Files: refactor 2022-06-09 13:24:54 +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
ef4b0a17f2 Files: added room presets 2022-06-09 11:38:34 +03:00
8ad71434c1 Files: added room presets 2022-06-09 11:33:31 +03:00
8f8fc7323d Files: refactor 2022-06-09 11:33:14 +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
e2ba706d71 Fix after merge 2022-06-08 16:38:34 +03:00
b693779ea1 Merge branch 'develop' into feature/docspace-pin 2022-06-08 16:38:16 +03:00
TimofeyBoyko
c0084cb7dc Web:Files/Components: add new images for virtual rooms page 2022-06-08 16:17:46 +03:00
02b4031ba0 fix Bug 57463 2022-06-08 12:53:33 +03:00
397cde0a3b Files: added pin/unpin, fix tags 2022-06-07 19:07:55 +03:00
5203feffe7 Web: Files: added table loader 2022-06-07 16:15:55 +03:00
TimofeyBoyko
617f3974e0 Web:Files: add new route virtual rooms 2022-06-07 13:19:19 +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
720121f56e add google and onedrive 2022-06-06 17:28:51 +03:00
8c56de7a26 moved from ddf515b8 2022-06-05 18:44:37 +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
cc7c29c8cf Files: fix 2022-06-03 13:26:16 +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
a0729a8084 thumbnail: first version
add from google and dropbox
2022-06-03 10:41:05 +03:00
57df81aa76 Files: added logo audit, fix 2022-06-03 01:27:56 +03:00
848751220c Files: added logos for rooms 2022-06-02 21:41:16 +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
3757174d08 fix test 2022-06-01 20:25:03 +03:00
bcec4e7e05 fix 57264 2022-06-01 18:55:22 +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
b1abac2eae Files: fixed move operation 2022-06-01 17:18:26 +03:00
cbcb8f903a Web: Files: combined add to favorites / remove from favorites in a single block 2022-06-01 17:14:54 +03:00
a861268e4f moved from ddf515b8 2022-06-01 17:07:08 +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
3ebd67f444 merge from develop 2022-06-01 14:44:30 +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
b81d3ff507 Files: fix routing 2022-05-31 16:49:54 +03:00
9902b536d9 Files: added thirdparty rooms filter 2022-05-31 16:49:39 +03:00
9584e8ba74 Files: fix 2022-05-31 16:47:59 +03:00
eda86591a1 Files: fix "MySql connection already in use" 2022-05-31 16:47:37 +03:00
2461b16468 fix Bug 53137: save lastModified when uploading file 2022-05-31 16:20:11 +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
73364c1fba Files: refactor 2022-05-30 14:32:00 +03:00
2a7853bf5b Files: added creating thirdparty rooms 2022-05-30 14:31:30 +03:00
1edb778115 Files: added thirdparty rooms 2022-05-30 14:30:08 +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
e704983452 Filex: fix controller 2022-05-29 22:36:28 +03:00
8bf6cdda9f Files: fix, added thirdparty archiving, deleting 2022-05-29 22:36:15 +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
9b779be2f4 Files: added thirdparty rooms 2022-05-27 19:02:47 +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
f7342801a2 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-27 11:54:29 +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
3f217af868 fix 57264 2022-05-26 22:00:09 +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
f3505e2b4a Web: fix smart banner meta 2022-05-26 17:35:59 +03:00
5f9c5c54e7 Files: added db entity fields 2022-05-26 17:34:04 +03:00
66ad7f5c9e fix 57358 2022-05-26 17:29:57 +03:00
Timofey Boyko
6ce9963ee6 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 17:07:32 +03:00
Timofey Boyko
26a7533ac7 Web:Files:DragTooltip: increase z-index 2022-05-26 17:07:27 +03:00
7691ab5f90 fix 57359 2022-05-26 17:03:43 +03:00
dc7d837e46 Merge branch 'release/v1.2' into feature/smart-banner 2022-05-26 16:57:04 +03:00
e2e8f3fce9 Merge branch 'feature/docspace-tags' into feature/docspace-thirdparty 2022-05-26 16:39:19 +03:00
3123bbd187 Files: added tags filtering 2022-05-26 16:37:31 +03:00
aa9b6cbb19 fix 57223 2022-05-26 16:20:30 +03:00
10e2b77ca9 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 15:11:08 +03:00
mushka
9a91b32783 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 15:08:56 +03:00
mushka
31380a6956 Fixed for unexisting InfoPanel EmptyScreen 2022-05-26 15:08:17 +03:00
1d4d8055bb Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-26 15:00:35 +03:00
6c349b5240 edit translations 2022-05-26 14:59:50 +03:00
e9866bf339 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 14:59:28 +03:00
06a565b02d Web:Files:Adding props areaSelect. 2022-05-26 14:58:16 +03:00
518fe17d14 refactor 2022-05-26 14:43:56 +03:00
mushka
8b63d4e489 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 14:37:05 +03:00
mushka
a70b8895c5 Bug 52730: Empty screen for InfoPanel in all sections except My documents 2022-05-26 14:36:55 +03:00
76db35e748 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 13:40:26 +03:00
968e4440ea Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-26 13:18:06 +03:00
52a779326e edit translations 2022-05-26 13:16:53 +03:00
03eaaf4b19 Files: added thirdparty rooms connection 2022-05-26 13:13:25 +03:00
597e121a95 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 15:08:52 +05:00
ba1b93d777 Web: People, Files: fixed banner display delay 2022-05-26 15:08:10 +05:00
Timofey Boyko
4f9cc695e3 Fix Bug 57339 - Client.Files.Upload.Dragndrop. The file does not load when dragging it to the left menu folder 2022-05-26 13:03:01 +03:00
29b3c61355 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 12:55:16 +03:00
2e021b107c Web: Files: fixed selected hover styles 2022-05-26 12:55:09 +03:00
5414a9b3df Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 12:10:16 +03:00
cfeca5f1d0 Web: Files: Badges: fix title 2022-05-26 12:09:49 +03:00
2b72a57115 Web: Files: added hover selection for tile folders 2022-05-26 12:05:29 +03:00
e7886aff2c Log: refactoring 2022-05-26 12:01:54 +03:00
ceeb190c0a Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 11:31:03 +03:00
7c7c12fe72 Web: Files: fixed horizontal scroll when file selected for mobile devices 2022-05-26 11:25:58 +03:00
cdf2acf313 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 10:27:31 +03:00
Timofey Boyko
8baead7b2c Fix Bug 57348 - Client.Files. fix layout for overwrite confirmation dialog 2022-05-26 10:09:47 +03:00
7d42847f60 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-25 20:05:01 +03:00
0bce8b6d17 edit translations 2022-05-25 18:41:16 +03:00
b13fd240ad Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-25 18:11:50 +03:00
903767b3e8 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	web/ASC.Web.Client/public/locales/ro/Error403.json
#	web/ASC.Web.Client/public/locales/ro/ErrorInvalid.json
#	web/ASC.Web.Client/public/locales/ro/Offline.json
2022-05-25 18:07:28 +03:00
83c5b3bd9e Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 18:02:18 +03:00
8612f14060 Web: Client: Fixed displaying page icon for creating page shortcut, fixed page display mode at manifest 2022-05-25 18:01:38 +03:00
Timofey Boyko
41e0f6fb5a Web:Files:Section: fix simple files row code format 2022-05-25 17:55:53 +03:00
e514f67cea edit translations 2022-05-25 17:51:59 +03:00
Timofey Boyko
e56f1c55e4 Web:Files:Section: fix horizontal scroll when drag and drop active 2022-05-25 17:30:49 +03:00
Timofey Boyko
ba28b13321 Web:Files/Common: fix section width on desktop 2022-05-25 17:24:55 +03:00
e01858d2e8 merge from develop 2022-05-25 16:58:31 +03:00
e6d7979e92 dbcontext: EnableRetryOnFailure for MySQL provider 2022-05-25 16:55:38 +03:00
2eee88dc99 Web: Files: fixed dragging styles 2022-05-25 16:28:57 +03:00
f6dd1a386b Fixed Bug 57346: Client: Files: Fixed opening version history window on mobile devices via context menu 2022-05-25 16:28:24 +03:00
Timofey Boyko
9f77e862d8 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 15:57:08 +03:00
7bfcddc043 Merge branch 'release/v1.2' into feature/smart-banner 2022-05-25 15:56:27 +03:00
6e3db60440 Web: Translations: Moved MoveToFolderMessage from OperationsPanel.json to Home.json (SingleKeyFilesTest issue fix) 2022-05-25 15:55:45 +03:00
8aa2052b31 Web: Files: add meta and icon for smart banner 2022-05-25 15:53:57 +03:00
Timofey Boyko
2a84281eb7 Web:Files:TableView: fix background for table row when drag and drop is active 2022-05-25 15:52:49 +03:00
a151611b42 Web: Files: fixed hover selection for mobile devices 2022-05-25 15:42:54 +03:00
664e718fa0 Files: added custom tags audit 2022-05-25 15:34:38 +03:00
94836dd2b5 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 14:17:42 +03:00
a5ed08b838 Fixed Bug 57338 - Client.HoveredRow. Added selection row on hover 2022-05-25 14:17:35 +03:00
be3bbf9188 Web: Client: Files: Fixed error on canceling cloud file/folder moving dialog 2022-05-25 12:33:08 +03:00
87b131c807 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 11:00:20 +03:00
032feddda8 Fix Bug 57218: oform edit icon 2022-05-25 10:59:55 +03:00
70a6a44196 Web: Client: Disable PWA feature for mobile devices 2022-05-25 10:53:39 +03:00
a66c03aa86 Merge branch 'develop' into feature/logger-refactoring
# Conflicts:
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Storage/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
#	common/services/ASC.Notify/GlobalUsings.cs
#	common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
#	common/services/ASC.Notify/Services/NotifySenderService.cs
#	common/services/ASC.TelegramService/GlobalUsings.cs
#	common/services/ASC.TelegramService/TelegramHandler.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
2022-05-24 23:13:57 +03:00
948ddcf6a0 Web: Files: Tile: fix padding 2022-05-24 19:27:56 +03:00
b525696b03 fix usings 2022-05-24 18:41:28 +03:00
2a10ac929f edit translations 2022-05-24 18:41:22 +03:00
9581477d4e edit translations 2022-05-24 18:29:05 +03:00
02570e12cf Merge branch 'develop' into feature/cluster-services 2022-05-24 17:24:25 +03:00
8d9ee14ea6 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-24 16:49:36 +03:00
912f694b0d edit translations 2022-05-24 16:46:57 +03:00
f137a8904e Web: Files: InfoPanel: add missed prop 2022-05-24 16:42:05 +03:00
89ac1296e3 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 16:37:01 +03:00
7fb8c12d32 Web: Files: Removed removal of paths from the store for the backup module, otherwise the scroll to the selected folder does not work on the second opening. 2022-05-24 16:34:56 +03:00
b3fc8a3401 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 15:49:24 +03:00
37f10e7013 Web: Client: Files: Clouds Fixed default names for connected clouds 2022-05-24 15:49:15 +03:00
3ce78ed5a8 fix 57223 2022-05-24 15:22:25 +03:00
907d92fcb6 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-24 15:00:26 +03:00
bed0e0d324 edit translations 2022-05-24 14:57:37 +03:00
2be66344bd fix bug 57261 2022-05-24 14:47:44 +03:00
10b8f3ad13
Merge pull request #677 from ONLYOFFICE/feature/multiply-thumb
Feature/multiply thumb
2022-05-24 14:11:22 +03:00
mushka
fbbc98caca Revert "Bug 57230: InfoPanel now doesnt display root folder Properties"
This reverts commit 71d5d98ec1.
2022-05-24 13:40:28 +03:00
f9f36e96a3 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 13:28:17 +03:00
59d860b9b2 Web: Files: fixed hotkeys 2022-05-24 13:28:10 +03:00
ea4b14ac47 Merge branch 'release/v1.2' into feature/multiply-thumb 2022-05-24 12:29:49 +03:00
961a6ec536 Merge branch 'feature/multiply-thumb' of https://github.com/ONLYOFFICE/AppServer into feature/multiply-thumb 2022-05-24 12:29:35 +03:00
ea4bfc988b Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 11:48:21 +03:00
f51e96af1f Web: Files: Fixed not opening subfolders in the tree, added expanding the tree to the selected folder. Refactoring. (For the folder selection dialog in the backup module) 2022-05-24 11:46:37 +03:00
0466af6bbb Files: resize by width 2022-05-24 11:45:28 +03:00
Timofey Boyko
38e3aaa5c4 Web:Files:InfoPanel: fix import getCorrectDate util 2022-05-24 13:06:56 +08:00
Timofey Boyko
585a9e25a5 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 13:03:43 +08:00
Timofey Boyko
4fa93d8b1e Fix Bug 57273 - incorrect display of time in the info panel 2022-05-24 13:03:36 +08:00
Timofey Boyko
751c702509 Web:Files:HOCs: changed portal culture in getStatusByDate method for personal depend on the user locale and update this method with getCorrectDate util 2022-05-24 12:36:00 +08:00
d0f88846eb Web: Translations: Moved 'Version' key from VersionBadge.json to Home.json (new 'VersionBadge' key) and removed VersionBadge.json 2022-05-23 21:30:10 +03:00
8d3921eae9 Web: Translations: Removed keys: TitleDocuments, TitleSubfolders, More (UselessTranslationKeysTest issues fix) 2022-05-23 20:25:42 +03:00
13ad4381f7 Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
2022-05-23 18:48:23 +03:00
d1494ca672 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-23 18:10:09 +03:00
df09f5e6b1 edit translations (SpellCheck) 2022-05-23 18:08:24 +03:00
a916b3ef69 update uk 2022-05-23 18:08:01 +03:00
Timofey Boyko
c8376ff508 Web:Files:TileView: hide desktop sorting in body for mobile size devices 2022-05-23 21:51:46 +08:00
3aa46cffa8 Web: Files: EditingWrapper: hide input 2022-05-23 16:32:49 +03:00
5d76f11b07 Web: Files: EditingWrapper: delete console log 2022-05-23 16:13:50 +03:00
b95ba16e2d Web: Files: fix tile border radius 2022-05-23 16:11:09 +03:00
864b8268a5 Web: Files: EditingWrapper: fix tile height 2022-05-23 15:39:13 +03:00
36a41e96aa Web: Files: Moved common code into function. 2022-05-23 15:31:17 +03:00
2b9131330c Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-23 15:19:07 +03:00
de0e722776 Fixed Bug 55045: Added scroll to current folder where file located in select folder dialog. 2022-05-23 15:15:39 +03:00
4e6cd1ad12 Web: Files: Banner: fix warning 2022-05-23 14:26:23 +03:00
dcc23ebbe5 Files: fix 2022-05-23 13:13:24 +03:00
mushka
e4eff11d28 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-23 12:34:52 +03:00
mushka
71d5d98ec1 Bug 57230: InfoPanel now doesnt display root folder Properties 2022-05-23 12:34:41 +03:00
5fa9c839e6 Files: fix 2022-05-23 12:29:14 +03:00
c9357da3b0 Files: added deleting tags, fix 2022-05-23 12:25:33 +03:00
196bbcc11b edit es 2022-05-23 11:57:52 +03:00
2ee9072ff5 update cs (Home) 2022-05-23 11:27:00 +03:00
44a600bee9 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-23 10:55:22 +03:00
9903f4c439 update cs, edit translations (spellCheck) 2022-05-23 10:55:02 +03:00
Timofey Boyko
9880b1659d Fix Bug 57228 - Client.Files.Share.Change the order of permission options in the list 2022-05-23 10:10:26 +03:00
8c68b9fb40 edit translations (SpellCheck) 2022-05-22 13:36:45 +03:00
6bc4035313 update translations 2022-05-21 15:25:14 +03:00
2e75100c52 update translations (Files) 2022-05-21 14:40:26 +03:00
ccf9b6285d Update translations (files) - pl 2022-05-20 20:54:21 +03:00
7b6abe81a2 Files: added custom tags 2022-05-20 19:26:13 +03:00
7493fe68e6 Merge branch 'release/v1.2' into bugfix/ReleaseBugfixes 2022-05-20 19:17:43 +03:00
182b482477
Merge pull request #671 from ONLYOFFICE/feature/update-translation-tests
Feature/update translation tests
2022-05-20 19:16:09 +03:00
b0dd87abde Update translations (files) - lv 2022-05-20 19:06:14 +03:00
4935dbc8cd Merge branch 'release/v1.2' into feature/update-translation-tests 2022-05-20 18:37:42 +03:00
27d2a98bd1 Merge branch 'feature/multiply-thumb' of https://github.com/ONLYOFFICE/AppServer into feature/multiply-thumb 2022-05-20 18:33:28 +03:00
91c4e454c5 add loggers 2022-05-20 18:24:41 +03:00
4c80a408df Files: fixed xlsx thumbnails 2022-05-20 18:24:32 +03:00
73083064ab Update translations (files) 2022-05-20 18:13:08 +03:00
4d21a1949a Web: Files: Fix annoying set thumbSize with same size (re-render issue fix) 2022-05-20 17:21:42 +03:00
04dcfb3d9a Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-20 17:11:37 +03:00
0b1b0280b0 Web:Files:Added isLoadingFilesFind, pageItemsLength, isHidePagination, setPageItemsLength to FilesStore. Added hiding pagination when deleting files.
Added a loader when searching for files when switching between pages.
2022-05-20 17:11:10 +03:00
75da995099 Merge branch 'develop' into feature/logger-refactoring 2022-05-20 17:01:51 +03:00
75b4f06c82 Fix Bug 57269: incorrect information in Size column 2022-05-20 16:40:49 +03:00
81dc197bcf Web: Files: Fix elementResizeDetector work for not first folder 2022-05-20 16:26:51 +03:00
fc4d8ceb3d Web: Files: Restored thumbnails cover in From Gallery 2022-05-20 16:25:40 +03:00
21d8d96e3c Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-20 16:23:57 +03:00
97fec09b0f Web: Files: fixed upload history when conversion single file 2022-05-20 16:23:51 +03:00
19d219ba84
Merge pull request #650 from ONLYOFFICE/feature/logger-Files.Core
Feature/logger files.core
2022-05-20 16:22:16 +03:00
be9c7ffd12 fix 2022-05-20 16:15:13 +03:00
99d82ee8d3 Fix Bug 57227: open media from upload folder 2022-05-20 15:27:45 +03:00
7943d92993 Fixed Bug 57266 - Client.Files. Fixed upload history for conversion files(empty upload/conversion panel). 2022-05-20 15:08:00 +03:00
a2b12c291e Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-20 14:56:29 +03:00
ab28837fb2 Fixed Bug 57248 - Client.Files. Fixed click on file lock icon 2022-05-20 14:56:22 +03:00
3e279ab031 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-20 14:08:08 +03:00
0058c3b22c Fix Bug 57260: textarea autofocus 2022-05-20 14:07:46 +03:00
d36b5e40c0 Update translations (files) 2022-05-20 14:07:40 +03:00
df8e07e99f Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-20 13:49:07 +03:00
cb0879da10 update, edit translations 2022-05-20 13:48:47 +03:00
f3d90fbf80 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-20 13:07:25 +03:00
355ec5f0e7 Fixed Bug 51909 - Client.Files. Disabled buttons in the header for a file opened for editing 2022-05-20 13:07:17 +03:00
baf219f0f5 Merge branch 'release/v1.2' into feature/multiply-thumb 2022-05-20 10:32:45 +03:00
fa0997db75 Thumbnail: fix 2022-05-19 22:28:08 +03:00
51f7839cce update translations (UploadPanel) 2022-05-19 20:25:43 +03:00
fcd78fbb88 update fi (Article) 2022-05-19 20:06:45 +03:00
bd11fcbbac Web: Files: change icons 2022-05-19 19:39:05 +03:00
b0f073d588 Web: Files: increase click area 2022-05-19 19:12:19 +03:00
c0a0e3b700 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-19 18:57:25 +03:00
f5c09d94b7 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	i18next/files.babel
2022-05-19 18:56:47 +03:00
d90fba7786 Web: Files: HotkeysPanel: increase backdrop z-index 2022-05-19 18:37:52 +03:00
424c4bb082 Update translations (common, files) 2022-05-19 18:36:49 +03:00
13aeb9c82c Fix Bug 57250: quick button double click 2022-05-19 18:00:14 +03:00
mushka
0c69bfdabf Merge branch 'release/v1.2' into bugfix/ReleaseBugfixes 2022-05-19 17:56:19 +03:00
mushka
f9698e767e trash folder api tryouts 2022-05-19 17:53:26 +03:00
b1f7d538a3 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-19 17:47:41 +03:00
Timofey Boyko
31dec5f6e9 Web:Files:Tests: add new translation tests: sort button on tile view, add button, filter block and context menu 2022-05-19 17:27:14 +03:00
Timofey Boyko
cb23ce1718 Web:Files/People:Tests: update changeCulture helper for personal 2022-05-19 17:25:20 +03:00
Timofey Boyko
373e6dca0f Web:Files:Tests: hide browser when tests are running 2022-05-19 17:24:26 +03:00
addb0d66ab Web: Files: FolderTreeBody: Removed warnings. 2022-05-19 16:14:52 +03:00
f812c8e052
Merge pull request #652 from ONLYOFFICE/feature/logger-Files
Feature/logger files
2022-05-19 16:14:47 +03:00
Timofey Boyko
6c73ad9bbe Web: add scripts for build and start translation tests on personal 2022-05-19 15:26:09 +03:00
Timofey Boyko
58a41243e1 Web:Files/People:Tests: add mock-data for personal build 2022-05-19 15:25:10 +03:00
013532bbb7 Fixed Bug 57232 - Client.Files.Share.Editor. Fixed access rights in editor 2022-05-19 15:22:52 +03:00
f2ede4c62c Web: Files: Applied changes of new thumbnail sizes 2022-05-19 15:19:51 +03:00
Timofey Boyko
d7898d3bf1 Web:Files/People:Tests: update translation tests for personal 2022-05-19 15:09:26 +03:00
Timofey Boyko
00fcb61aa7 Web:Files/People:Tests: delete screenshotOutput when model translation tests begin 2022-05-19 15:07:38 +03:00
a3a227a314 edit it (Article) 2022-05-19 14:50:27 +03:00
79159d5647 update it 2022-05-19 14:43:40 +03:00
68c96add8b Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-19 14:35:15 +03:00
15f4fb324e update it, edit fr 2022-05-19 14:34:56 +03:00
dd68c9d89d Fix Bug 57234: delete owner and author of correction url 2022-05-19 13:37:52 +03:00
f8a4a7cf7c Merge branch 'release/v1.2' into feature/multiply-thumb 2022-05-19 12:27:18 +03:00
7792f001ad Fixed Bug 57225 - Client.Files.VersionHistory. Fixed comment editing in version history. 2022-05-19 11:29:13 +03:00
32e83e05a4 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-19 09:59:19 +03:00
022063124c Web: Files: Removed the loader when changing the dialog type. 2022-05-19 09:55:39 +03:00
79f79a252a Web: Files: Scroll down is removed if you selected a folder. Renaming a variable. 2022-05-19 09:32:37 +03:00
982c3d9488 Fix Bug 57220: Something went wrong when navigate in Trash 2022-05-18 22:40:15 +03:00
128021653d Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	products/ASC.Files/Client/public/locales/bg/ConnectDialog.json
#	products/ASC.Files/Client/public/locales/ro/Article.json
#	products/ASC.Files/Client/public/locales/ro/FormGallery.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/InfoPanel.json
#	products/ASC.Files/Client/public/locales/ro/SelectFolder.json
#	products/ASC.Files/Client/public/locales/ro/Settings.json
#	products/ASC.Files/Client/public/locales/ro/Translations.json
2022-05-18 20:18:32 +03:00
b2f6ce39f7 Update translations (common, files) 2022-05-18 19:54:25 +03:00
a8b5aad30d edit fr 2022-05-18 19:20:19 +03:00
1639a82f2c edit en 2022-05-18 19:18:30 +03:00
Timofey Boyko
830491e7ca Merge branch 'release/v1.2' into feature/update-translation-tests 2022-05-18 19:17:12 +03:00
74c9b75b0c Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-18 19:12:07 +03:00
41ab332458 update translations 2022-05-18 19:11:50 +03:00
ae795f8b95 Merge branch 'feature/multiply-thumb' of github.com:ONLYOFFICE/AppServer into feature/multiply-thumb 2022-05-18 19:10:56 +03:00
8e913c8348 Files: thumbnails extensions moved to configuration 2022-05-18 19:10:42 +03:00
018e1504b7 Merge branch 'release/v1.2' into feature/multiply-thumb 2022-05-18 18:38:18 +03:00
321085c205
Merge pull request #669 from ONLYOFFICE/feature/change-size-table-view
Feature/Change table resize with info panel
2022-05-18 18:33:31 +03:00
a9511d7a54
Merge pull request #670 from ONLYOFFICE/feature/upload-history
Web: Files: added history of uploads
2022-05-18 18:32:54 +03:00
9fb495817d update translations 2022-05-18 18:25:31 +03:00
e8752ce4b6 Merge branch 'release/v1.2' into feature/upload-history 2022-05-18 17:36:36 +03:00
c5fb8d0d6f Files: thumbs. default size 2022-05-18 17:31:33 +03:00
9886081a2e Thumbnailы: added sizes config 2022-05-18 17:23:17 +03:00
fd47a15a31 Merge branch 'release/v1.2' into feature/info-panel-redesign 2022-05-18 17:07:35 +03:00
Timofey Boyko
295ad63ebf Web:Files: start cloneModelScreenshot helper after creating model translation screenshots for en culture 2022-05-18 16:08:17 +03:00
Timofey Boyko
eaee2d2375 Web:Files:Tests: update pathToModels for cloneModelScreenshot helper 2022-05-18 16:07:11 +03:00
Timofey Boyko
13a96c920f Web:Files:Tests: add cloneModelScreenshot helper 2022-05-18 15:31:30 +03:00
Timofey Boyko
c2d9b8d893 Web:Files:Tests: update translation tests and delete useless code 2022-05-18 15:29:19 +03:00
Timofey Boyko
86697f3665 Web:Files:Tests: change screenshotOutput and baseFolder for translation tests 2022-05-18 15:26:37 +03:00
Timofey Boyko
20f97759a8 Web:Files:Tests: remove translation model from git 2022-05-18 15:25:26 +03:00
Timofey Boyko
618ead2c4e Web:Files:Tests: add new folder mock for mockData function 2022-05-18 15:17:49 +03:00
b643699e72 Web: Files: added history of uploads 2022-05-18 15:09:25 +03:00
0fb61a7889 Edit translations - fi, sl 2022-05-18 13:18:19 +03:00
5f4d8b3b4c Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-18 12:58:24 +03:00
9180fbe42e update ko 2022-05-18 12:58:02 +03:00
mushka
ca1d34c07a Removed a modified file from pull request 2022-05-18 12:44:34 +03:00
Timofey Boyko
f1572fcd6e Web:Files:TableView: delete useless code 2022-05-18 11:29:26 +03:00
Timofey Boyko
538f16ec0f Web:Files/People/Components:TableView: remove inline styles and move it to styled components 2022-05-18 11:27:17 +03:00
Timofey Boyko
b42657adea Web:Files:Filter: update changeViewAs function with info panel logic 2022-05-18 11:07:08 +03:00
Timofey Boyko
90be01e47d Web:Files:TableView: update changing view method 2022-05-18 10:45:05 +03:00
Timofey Boyko
ae18b68008 Merge branch 'release/v1.2' into feature/change-size-table-view 2022-05-18 10:41:26 +03:00
Timofey Boyko
a96f766f4a Web:Files:Section: update logic changing from table view row and back 2022-05-18 10:40:37 +03:00
90d4a68946 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	web/ASC.Web.Client/public/locales/sl/Settings.json
2022-05-18 10:09:44 +03:00
9c824a0bfa Update translation - sl 2022-05-18 09:59:02 +03:00
e339b62145 edit ro (Home) 2022-05-17 20:14:22 +03:00
f6098aea20 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	web/ASC.Web.Client/public/locales/ro/Settings.json
2022-05-17 19:57:22 +03:00
f1130c51d9 update ro 2022-05-17 19:54:47 +03:00
b8306cb8cb Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-17 19:25:49 +03:00
24b531bd41 Web:Files:Fixed display of file name in toast when copying. 2022-05-17 19:25:31 +03:00
dc916be376 Web:Files:Removed redundant argument. 2022-05-17 19:24:34 +03:00
f466fd2fe4 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-17 18:17:17 +03:00
dad9016695 Web: Translations: Moved "NotFoundTitle" key from "studio" to "Common": (EnDublicatesByContentTest33ms issue fix) 2022-05-17 18:17:11 +03:00
Timofey Boyko
263af1cc85 Merge branch 'release/v1.2' into feature/change-size-table-view 2022-05-17 17:58:49 +03:00
mushka
e31a4bf2e4 fixed dislocated header option btn 2022-05-17 17:54:32 +03:00
2b804d5ef8 edit es, fr, zh-CN, ja, de, ru 2022-05-17 17:20:59 +03:00
mushka
f1ccf5f34f some tests on asc.files 2022-05-17 17:20:57 +03:00
232ca0355e edit es, fr 2022-05-17 16:48:47 +03:00
2ed7b96dd9 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-17 16:43:15 +03:00
cc9d934b13 update de, edit en (Confirm) 2022-05-17 16:42:54 +03:00
Timofey Boyko
dd8fba5eca Web:Files/Components: add comments for change sectio view method 2022-05-17 16:39:37 +03:00
Timofey Boyko
2aeed8e287 Web:Files/Components: fix changing view with opened info panel 2022-05-17 16:30:31 +03:00
461d206708 Web: Files: EditingWrapper: fix title 2022-05-17 16:10:17 +03:00
f26dc878ef Merge branch 'release/v1.2' into feature/info-panel-redesign 2022-05-17 15:50:06 +03:00
2c723c704a Web: Files: SharingPanel: fix crash 2022-05-17 15:49:41 +03:00
ddb1cb4dd9
Merge pull request #635 from ONLYOFFICE/feature/scroll-to-current-folder
Web: Files: Added scroll to current folder in selectors components.
2022-05-17 15:47:43 +03:00
fb5d1494d0 Merge branch 'release/v1.2' into feature/scroll-to-current-folder
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
2022-05-17 15:40:44 +03:00
43da9f3949 Update translation - fi 2022-05-17 15:35:03 +03:00
4c53f0d4db
Merge pull request #661 from ONLYOFFICE/feature/upload-logic-change
Web: Files: added alert badge to main-button, upload logic changed
2022-05-17 14:38:38 +03:00
ddfe290f11 Web: Client: Files: Added clearing activeFiles and activeFolders after empty trash operation 2022-05-17 14:35:28 +03:00
11211406f7 Web: Files: Fixed first scroll to deep folder. 2022-05-17 14:29:06 +03:00
3db47823bd Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-17 12:57:17 +03:00
be3362dbc3 update ja, edit fr, es, zh-CN (Settings) 2022-05-17 12:56:56 +03:00
5535bc870a Web: Client: Files: Fixed empty trash button click on already starting emptying trash operation 2022-05-17 12:49:28 +03:00
Timofey Boyko
6fccae257f Web:Files:Home: change method for changing view from row to table and back 2022-05-17 12:47:12 +03:00
36855d656f remove application/x-www-form-urlencoded 2022-05-17 12:29:24 +03:00
2e33540486 Merge branch 'feature/docspace' into feature/docspace-links 2022-05-17 11:53:37 +03:00
6c45bb0632 Merge branch 'develop' into feature/docspace 2022-05-17 11:50:56 +03:00
c769a5a423 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-17 11:47:23 +03:00
3fd6c7bd89 Web: Client: Files: Row: Fixed displaying context menu button inside editing container 2022-05-17 11:47:16 +03:00
ab3920e8a7 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-17 11:11:00 +03:00
9a2243d915 Web:Files:Added setSelectedItems method to write selected items. 2022-05-17 11:10:48 +03:00
9229f97ed5 Web:Files:Display itemsSelectionLength and itemsSelectionTitle in a toast. 2022-05-17 11:10:04 +03:00
cd69afbcd8 Web:Files:Added setSelectedItems method to write selected items. 2022-05-17 11:08:49 +03:00
de653844c2 Web:Files:Added storage of the names of the selected items for output to the toast in the SecondaryProgressDataStore. 2022-05-17 11:07:36 +03:00
Timofey Boyko
2970f6815d Merge branch 'release/v1.2' into feature/change-size-table-view 2022-05-17 10:54:21 +03:00
a46c69cdb2 Web: Files: fixed FloatingButton styles 2022-05-17 10:54:11 +03:00
Timofey Boyko
631d63c6e2 Web:Files:TableView: add new local storage name for info panel columns size 2022-05-17 10:43:26 +03:00
1b55e44df8 edit es, zh-CN (Home) 2022-05-17 10:24:43 +03:00
84af3bedaa update zh (Home) 2022-05-16 21:15:59 +03:00
606f0bca2a update es (Home), add zh 2022-05-16 21:05:58 +03:00
41a0f07bfa Web: Files: added alert badge to main-button, upload logic changed 2022-05-16 18:03:21 +03:00
3818790d1c update ru, fr 2022-05-16 18:01:38 +03:00
778f26c1fc Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-16 17:04:28 +03:00
4264a0da16 update fr 2022-05-16 17:04:04 +03:00
4a2369f545 Merge branch 'release/v1.2' into feature/scroll-to-current-folder 2022-05-16 15:57:47 +03:00
f8ce260d91 Web: Files: MediaViewer: fix memory leak 2022-05-16 14:31:29 +03:00
18556d96af Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-16 14:11:42 +03:00
1ab817fad8 Web: Files: fixed scroll to created folder 2022-05-16 14:11:34 +03:00
9ed3b1cb2f fix tests 2022-05-16 13:58:45 +03:00
a02acf96b1 Web: Files: EmptyContainer: fix memory leak 2022-05-16 13:41:06 +03:00
7913166c14 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-16 13:01:38 +03:00
9b2a0c2895 Web: Files: Fixed input with in file selector dialog. 2022-05-16 12:59:06 +03:00
39302e3f59 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-16 12:51:35 +03:00
5915c6e23e update es 2022-05-16 12:51:04 +03:00
mushka
b8129fd684 removed toggle from header on tablet & mobile and added View Details option to folder context menu 2022-05-16 12:04:59 +03:00
4f44f7d611 Web: Files: Removed border extension between lines. 2022-05-16 11:27:36 +03:00
Timofey Boyko
6de995ff81 Web:Files:TableView: change min width for name table column 2022-05-16 11:21:35 +03:00
Timofey Boyko
d05d9fcecf Web:Files:TableView: change width for author cell column 2022-05-16 11:21:01 +03:00
Timofey Boyko
7f4c0db692 Web:Files:TableView: remove useless padding-right for quick buttons and table cell element wrapper 2022-05-16 11:20:35 +03:00
d85b208dc9 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-13 23:21:42 +03:00
d0525e298c thumbnails, notify, telegram: migrate from ICacheNotify to EventBus 2022-05-13 22:14:00 +03:00
Timofey Boyko
6767c9da00 Web:Files:TableView: increase min width for name column 2022-05-13 19:50:21 +03:00
d12c6f89e4 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-13 19:33:23 +03:00
93a53092d6 Web: Translations: Fix UselessTranslationKeysTest issues 2022-05-13 19:33:16 +03:00
025d13557d added a secure link to invite to the portal 2022-05-13 19:25:28 +03:00
Artem Tarasov
f645274150 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-13 19:17:53 +03:00
Artem Tarasov
a5b31142a1 Web: Files: Home/FilesStore: added scroll to created folder 2022-05-13 19:17:24 +03:00
Timofey Boyko
5037859e72 Web:Files:TableView: change quick button default size 2022-05-13 19:12:41 +03:00
Timofey Boyko
116d44db3d Web:Files:TableView: disable switch view to row when info panel is opening in table view 2022-05-13 19:01:45 +03:00
Timofey Boyko
7618a5b38b Web:Files:TableView: add info panel visible props to table header 2022-05-13 18:48:09 +03:00
3bf09b4353 add new es-files 2022-05-13 18:22:32 +03:00
161add9853 Web: Files: Bar: fix memory leak 2022-05-13 18:15:52 +03:00
f4727b411e Test: fix 2022-05-13 18:08:30 +03:00
294a449d78 add new ru-keys, edit en 2022-05-13 17:30:51 +03:00
20341f1cce Merge branch 'release/v1.2' into feature/scroll-to-current-folder 2022-05-13 16:09:52 +03:00
c4c0b2a012 Web: Files: Fixed styles. 2022-05-13 15:58:55 +03:00
0a2aaf84c1 Web: Components/Files: Updated version of "rc-tree" and fixed problems after that. 2022-05-13 15:58:22 +03:00
db3dea16fd Web: Files: UploadPanel: fix prop type warning 2022-05-13 15:41:10 +03:00
245dfb9fc6 Web: Files: show error for empty file upload 2022-05-13 15:36:24 +03:00
14f25c2da7 Test: fix 2022-05-13 14:48:51 +03:00
c21898f2e0 add logger 2022-05-13 12:33:44 +03:00
969c037d3c Merge branch 'develop' into feature/fix-tests 2022-05-13 12:27:30 +03:00
a956c25d16
Merge pull request #639 from ONLYOFFICE/feature/resx-add
Feature/resx add
2022-05-13 11:50:54 +03:00
ada737287b Web: Files: Replaced "HotkeysUploadFolder" to "Article:UploadFolder" (EnDublicatesByContentTest issue fix) 2022-05-13 10:42:46 +03:00
cb024b0bbb revert 85dffc552f 0c9147b815 2022-05-13 09:56:16 +03:00
Timofey Boyko
2d5718419e Web:Files:ConnectedClouds: add separator to third party context menu 2022-05-13 07:33:17 +03:00
Timofey Boyko
0c9147b815 Web:Components:Themes: fix error for connected clouds page 2022-05-12 19:07:50 +03:00
7262c4cbb8 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-12 19:00:51 +03:00
122affb8a2 add loggers 2022-05-12 18:35:48 +03:00
Timofey Boyko
da7429c34c Web:Files:Filter: change translations 'contextMenuHeader' and 'headerLabel' for filter input 2022-05-12 18:35:15 +03:00
e9be6684ae Resources: fixed projects 2022-05-12 18:32:39 +03:00
Timofey Boyko
8c7ba2d3ac Web:Files:Locales: add new key 'AddAuthor' for EU and RU locales 2022-05-12 18:29:54 +03:00
mushka
98321a7cf4 fixed InfoPanel property text truncation (276) 2022-05-12 18:27:01 +03:00
Artem Tarasov
bbcbb79a74 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-12 17:43:09 +03:00
Artem Tarasov
c4a522d9c8 Web: Files: added selection of new created folder 2022-05-12 17:42:44 +03:00
mushka
cc41fc36e2 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into bugfix/ReleaseBugfixes 2022-05-12 17:22:39 +03:00
mushka
9fdafab467 changed InfoPanel toggle location 2022-05-12 17:16:57 +03:00
Timofey Boyko
85dffc552f Web:Components:Themes: add color to connected clouds for base theme 2022-05-12 16:16:50 +03:00
Timofey Boyko
8e5e699fed Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-12 15:25:52 +03:00
Timofey Boyko
fe371732fd Web:Client:ConnectedClouds: add dark-theme support 2022-05-12 15:21:28 +03:00
3b7309eb6b Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-12 15:12:16 +03:00
8e9d1ad4d5 Web:Files:Added setIsBurgerLoading to HOC withLoader. 2022-05-12 15:01:26 +03:00
fc846860f9 Web: Translations: Moved "AddUsers" key from "Files,People" to "Common" (test issue fix) 2022-05-12 14:18:16 +03:00
2070a1f06d Files: Pattern. Resources. 2022-05-12 14:08:35 +03:00
e09d409763 Files: common. Resources. 2022-05-12 14:03:42 +03:00
cd0323954c Files: JS. Resources 2022-05-12 13:48:50 +03:00
29133aaf13 Files: common. Resources 2022-05-12 13:45:52 +03:00
d6a039b8cd Files: updated docxf, oform, az. added gl-ES, tr 2022-05-12 13:38:23 +03:00
a0f67cfe27 add loggers 2022-05-12 11:14:00 +03:00
80d8ffd67a Web: Files: fix openLocation 2022-05-12 11:00:29 +03:00
26f381fdc5 Web: Files: EditingWrapper: fix create/cancel file 2022-05-12 10:29:43 +03:00