Commit Graph

29944 Commits

Author SHA1 Message Date
6b7f1b313d Merge branch 'feature/advanced-security' of github.com:ONLYOFFICE/DocSpace into feature/advanced-security 2022-12-16 15:02:14 +03:00
50b1cd34c8 Files: fixed archiving/deleting room with locked files 2022-12-16 15:02:06 +03:00
Timofey Boyko
d5a15412cc Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-16 14:19:04 +03:00
43cfe58752 Web: Deleted canConvert function from store. 2022-12-16 13:57:09 +03:00
Timofey Boyko
620c44d834 Fixed Bug 60170 - Rooms. New member not showing up in Info/Members panel after adding. 2022-12-16 13:56:47 +03:00
57707de013 Web: Deleted canConvert; 2022-12-16 13:54:39 +03:00
966de4f2f2
Merge pull request #1126 from ONLYOFFICE/feature/logo
Feature/logo
2022-12-16 14:30:06 +04:00
d0b03e170b Files: fix 2022-12-16 13:24:05 +03:00
496d7d2d48 Files: added logging 2022-12-16 11:45:39 +03:00
cfc81fc626 Merge branch 'feature/advanced-security' of github.com:ONLYOFFICE/DocSpace into feature/advanced-security 2022-12-16 11:42:36 +03:00
e12637ddb3 Files: fixed getting lock tag, removed unnecessary 2022-12-16 11:42:22 +03:00
5566298dca Files: removed CanWebRestrictedEditing, CanFillForms, CanEdit
added Accessability:convert
2022-12-15 20:54:35 +03:00
DmitrySychugov
41965071c7 Web: Components: added two-finger touch event recognition 2022-12-15 20:45:37 +05:00
Timofey Boyko
30692753bf Web: remove logoHandlers 2022-12-15 18:41:19 +03:00
8ba7f7f560 Web: Deleted useless code. 2022-12-15 17:52:43 +03:00
Mushka Nikita
0617a953d7 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-15 17:51:43 +03:00
Mushka Nikita
0b8412cb77 fixed aside close button styking 2022-12-15 17:51:33 +03:00
Mushka Nikita
53c50fba9a improved filterblockItem interactive area 2022-12-15 17:35:06 +03:00
Mushka Nikita
8a9a35717c fixed infoPanel and invitePanel overlaying 2022-12-15 17:34:41 +03:00
fd00fb18bb Files: removed unnecessary 2022-12-15 17:18:23 +03:00
37b2a9aafd Files: changed logic 2022-12-15 17:17:58 +03:00
8b009551fb Files: added HasLogo 2022-12-15 17:15:18 +03:00
01d1d14788 Files: added new migrations 2022-12-15 17:10:28 +03:00
4b1f4b1d4c Merge branch 'release/rc-v1.2.0' into feature/advanced-security
# Conflicts:
#	packages/client/src/store/FilesStore.js
2022-12-15 16:41:55 +03:00
5bd9c74603 Web: Files: fixed fetchFiles 2022-12-15 16:36:37 +03:00
0cf0ffbadb Merge branch 'release/rc-v1.2.0' into feature/advanced-security 2022-12-15 15:18:06 +03:00
Tatiana Lopaeva
e51a3bedda
Merge pull request #1124 from ONLYOFFICE/bugfix/fixed-files-actions
Bugfix/fixed files actions
2022-12-15 15:03:35 +03:00
Timofey Boyko
a56a17781b Web:Client:ContextOptionsStore: fix preview and edit context menu options 2022-12-15 14:28:31 +03:00
Timofey Boyko
ca85dd68d6 Web:Client:GlobalEvents: fix open new doc on FF 2022-12-15 14:16:19 +03:00
7847f30b7e Web: Fixed prop. 2022-12-15 13:46:22 +03:00
4c5c60e583 Web: Fixed rights. 2022-12-15 13:44:18 +03:00
c715e01762 WEb: Changed condition for lock icon. 2022-12-15 13:35:56 +03:00
5a80f7184d Web: Editor: Changed rights. 2022-12-15 13:32:53 +03:00
6b988718c4 Web: Additional conditions added. 2022-12-15 13:29:27 +03:00
ebb1e59d64 Merge branch 'feature/advanced-security' of github.com:ONLYOFFICE/AppServer into feature/advanced-security 2022-12-15 13:11:43 +03:00
55f8c5f290 Web: Fixed error for folders. 2022-12-15 13:08:33 +03:00
51fc421aa7 Web: Deleted isMediaOrImage function. 2022-12-15 12:47:31 +03:00
46b27dcd90 Deleted isVideo function. 2022-12-15 12:42:16 +03:00
5b5ab2a2b3 Web: Deleted canFormFillingDocs. 2022-12-15 12:33:55 +03:00
Timofey Boyko
6d869e4417 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-15 12:33:22 +03:00
Timofey Boyko
90fa8a5c48 Web:Client:FilesStore: fix getting room logo for new room 2022-12-15 12:33:18 +03:00
ad97ada122 Web: Refactoring rights. 2022-12-15 12:31:47 +03:00
f67659c43e Web: Fixed history editing. 2022-12-15 11:44:43 +03:00
aee7ec028e Web: Files: fixed delete operation 2022-12-15 11:24:44 +03:00
5abfaf135f Files: changed check 2022-12-15 10:31:37 +03:00
3c998f637a Files: removed unnecessary 2022-12-15 10:30:38 +03:00
c16a9dfb2e Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-14 22:30:45 +03:00
3b82a43e50 Web:Client:Fixing the re-render of the EmptyFolderContainer component when new props appear by adding a skeleton. Added waiting for the end of loading files and showing the component with the actual isRooms prop. 2022-12-14 22:30:12 +03:00
0a0d273e16 Web: Deleted canWebFilterEditing. 2022-12-14 20:58:36 +03:00
f2d1219c2c Web: Deleted canWebReview. 2022-12-14 20:54:08 +03:00