Commit Graph

2642 Commits

Author SHA1 Message Date
TatianaLopaeva
386529c6fd Merge branch 'develop' into feature/EditorIntegration
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-04-01 10:17:14 +03:00
166aaa8239
Merge branch 'develop' into bugfix/privacy-room 2021-03-31 18:01:58 +03:00
Vladislav Makhov
b0b8849ae5 web: files: fix isDesktop refer 2021-03-31 17:59:03 +03:00
TatianaLopaeva
33b165fd40 Web: Files/Editor: Added SharingDialog. 2021-03-31 16:49:14 +03:00
Vladislav Makhov
2c253bd471 web: files: rename isItemsSelected to selectionCount 2021-03-31 13:56:56 +03:00
Vladislav Makhov
56f49526ad web: files: fix link 2021-03-31 13:54:29 +03:00
c0e780a287 Web: Files: fixed showDragItems 2021-03-31 11:03:56 +03:00
Vladislav Makhov
1728da802d web: fix isAccessedSelected 2021-03-31 10:49:46 +03:00
TatianaLopaeva
b52997a7f8 Merge branch 'develop' into feature/EditorIntegration 2021-03-30 18:39:09 +03:00
Vladislav Makhov
75386c10ea web: files: add missing whitespaces in description 2021-03-30 16:05:04 +03:00
Vladislav Makhov
627e84aeaa web: files: fix isAccessedSelected 2021-03-30 15:53:47 +03:00
TatianaLopaeva
dea731dfa7 Web: Files/Editor: Deleted useless code. 2021-03-30 15:44:45 +03:00
TatianaLopaeva
3960ca1490 Web: Files: SharingPanel: Added loader when list of users does not load yet. 2021-03-30 15:24:44 +03:00
6c46dd759f Web: Files: fixed context options props 2021-03-30 12:14:25 +03:00
Vladislav Makhov
b4ea70ddaa web: files: regDesktop fix 2021-03-30 11:34:48 +03:00
06f34408ff Merge branch 'develop' into feature/drag-and-drop 2021-03-30 11:10:15 +03:00
9427d98318 Web: Files: refactoring 2021-03-30 11:08:38 +03:00
TatianaLopaeva
f6e242f341 Web: Files: Added name space for translation. 2021-03-30 10:34:09 +03:00
TatianaLopaeva
dc0baec941 Web: Editor/Files: Fix displaying of shared user list at Shared Panel & Refactoring. 2021-03-30 10:21:30 +03:00
TatianaLopaeva
005d6759e9 Web: Editor/Files: Deleted conditions for Edit & Fixed url to folder where the file is located. 2021-03-29 19:31:11 +03:00
3a756986a0 Files: added enableExternalExt when creating file 2021-03-29 17:53:12 +03:00
91aa5996b5 Web: Files: refactoring 2021-03-29 17:45:26 +03:00
Vladislav Makhov
701e5fc2d1 web: files: fix isOnlyFoldersSelected 2021-03-29 16:25:16 +03:00
Vladislav Makhov
ddba3d91bf web: files: fix isEncryptionSupport value 2021-03-29 16:13:21 +03:00
Vladislav Makhov
70b6e8fe51 web: files: fix share button for private room 2021-03-29 16:05:00 +03:00
Vladislav Makhov
760c3268df web: files: add missing prop 2021-03-29 16:03:34 +03:00
a8d475cb91 Merge branch 'develop' into feature/drag-and-drop 2021-03-29 15:26:22 +03:00
b574424224 Files: added enableExternalExt when creating file 2021-03-29 15:06:51 +03:00
f381eb2780 Web: Files: fixed move operations for third party folders 2021-03-29 14:56:39 +03:00
d10f47d984 Web: Files: fixed scroll 2021-03-29 12:06:01 +03:00
fa372f118b Web: Files: fixed scroll 2021-03-29 11:41:42 +03:00
TatianaLopaeva
704f241674 Web: Files: SharingPanel: Fixed icon pathname. 2021-03-28 23:00:21 +03:00
TatianaLopaeva
c4bcb8772c Web: Files/Editor: Added additional conditions for access to the sharing panel and updated conditions for the custom filter. 2021-03-28 22:59:36 +03:00
TatianaLopaeva
5ccb86abeb Web: Editor/Files: Refactoring & Moved icon to the common folder for icons. 2021-03-28 21:38:48 +03:00
TatianaLopaeva
88392ffd56 Web: Editor/Files: Refactoring. 2021-03-28 19:21:08 +03:00
TatianaLopaeva
9309818e77 Web: Files: Fixed internal link for document from the Editor. 2021-03-28 19:04:49 +03:00
TatianaLopaeva
89dbfd1f54 Web: Editor/Files: Fixed share email from the Editor. 2021-03-28 18:47:04 +03:00
06e8a79b06 Web: Files: fixed drag to tree 2021-03-26 19:11:41 +03:00
TatianaLopaeva
7777d05515 Web: Editor/Files: Added full list of access rights for SharingPanel to Editor. 2021-03-26 17:18:43 +03:00
e72558182b Web: Files: removed debugger 2021-03-26 17:12:40 +03:00
6b16402d82 Web: Files: fixed tree drag-and-drop, refactoring 2021-03-26 15:26:44 +03:00
TatianaLopaeva
2dba92ba28 Web: Editor/Files: Added refresh list of people and their access rights after changed at SharingPanel. 2021-03-26 15:19:55 +03:00
TatianaLopaeva
4892b39e0e Web: Editor: Added SharingPanel. 2021-03-26 15:14:17 +03:00
TatianaLopaeva
1b9c327e10 Web: Files: SharingPanel: Fix icon path. 2021-03-26 14:51:25 +03:00
TatianaLopaeva
0e1225cc5a Web: Files: helpers: Fix icon path. 2021-03-26 14:50:45 +03:00
TatianaLopaeva
c853accdf7 Web: Files: Fix icon path. 2021-03-26 14:50:12 +03:00
TatianaLopaeva
e2ebecac4d Web: Files: Fix icon path. 2021-03-26 14:49:28 +03:00
TatianaLopaeva
e837ef77b5 Web: Files: Moved translation from common file to local folder. 2021-03-26 14:48:37 +03:00
TatianaLopaeva
f27c38e2d9 Web: Moved icons from files to common folder. 2021-03-26 14:45:29 +03:00
2125a10011 Web: Files: fixed displaying selected node 2021-03-25 15:59:53 +03:00