Commit Graph

29256 Commits

Author SHA1 Message Date
5ccbda995b Web: Deleted getArchiveRoomRoleActions; 2022-12-14 19:42:12 +03:00
c209e55210 Web: Deleted useless code. 2022-12-14 19:35:35 +03:00
d87665c44f Web: Deleted canViewUsers. 2022-12-14 18:29:39 +03:00
690b8e9e24 Removed useless code. 2022-12-14 16:19:20 +03:00
fe51dc78b3 Web: Deleted canChangeUserRoleInRoom and canDeleteUserInRoom. 2022-12-14 16:11:09 +03:00
2f6b8651fd Merge branch 'feature/advanced-security' of github.com:ONLYOFFICE/AppServer into feature/advanced-security 2022-12-14 15:55:11 +03:00
7f75592e7f Web: Deleted canChangeVersionFileHistory and canViewRoomInfo. 2022-12-14 15:52:45 +03:00
40a2bc3ead Files: added edit access parametr to share 2022-12-14 15:48:55 +03:00
52149e1312 Web: Added local rights check. 2022-12-14 15:30:16 +03:00
fb755c6a9c Web: Deleted functions. 2022-12-14 15:09:28 +03:00
7e3a019166 Merge branch 'feature/advanced-security' of github.com:ONLYOFFICE/DocSpace into feature/advanced-security 2022-12-14 14:20:59 +03:00
51bfb4d7cb Files: added read access action 2022-12-14 14:20:47 +03:00
19011223fc Web: Fixed 'moved' function. 2022-12-14 13:43:11 +03:00
6bb8f4efce Merge branch 'feature/advanced-security' of github.com:ONLYOFFICE/AppServer into feature/advanced-security 2022-12-14 13:11:17 +03:00
24e82cb1eb Web: Fixed. 2022-12-14 13:10:50 +03:00
3a69c17856 Files: fixed security 2022-12-14 12:08:59 +03:00
b3ea0a8c7d Merge branch 'feature/advanced-security' of github.com:ONLYOFFICE/AppServer into feature/advanced-security 2022-12-14 11:52:23 +03:00
90c596fe53 Web: Fixed rights for editor. 2022-12-14 11:50:49 +03:00
498983e14a Files: fixed editing history for editor role 2022-12-14 11:49:39 +03:00
8ef076de60 Web: Added getting info from another object. 2022-12-14 11:15:47 +03:00
6adb6c748e Merge branch 'feature/advanced-security' of github.com:ONLYOFFICE/DocSpace into feature/advanced-security 2022-12-13 22:36:40 +03:00
ec2d02e018 Files: added duplicate action, fixed lock for my documents folder 2022-12-13 22:34:53 +03:00
c3650349a4 Web: Used the entitlement information for the room and info-panel from the request. 2022-12-13 18:20:42 +03:00
490f329a64 Web: Used information about right from request. 2022-12-13 17:36:29 +03:00
fb32a9f4f6 Merge branch 'release/rc-v1.2.0' into feature/advanced-security 2022-12-13 11:53:59 +03:00
Timofey Boyko
8a2920f3e4 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-13 10:53:14 +03:00
Timofey Boyko
3f588be767 Web:Common:API: refactoring getLogoIcon 2022-12-13 10:40:03 +03:00
Elyor Djalilov
658af130af Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-13 12:34:46 +05:00
Elyor Djalilov
656c533ea0 fixed display tooltip 2022-12-13 12:34:36 +05:00
d5fdcfd7b5 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-13 09:52:05 +03:00
a0b86c0562 Fix Failed to execute 'toDataURL' Tainted canvases may not be exported 2022-12-13 08:53:55 +03:00
018dce9e36 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-12 23:38:50 +03:00
c9e1c702e6 Web:Components:Fixed dropdown for the list of roles of room users, so that if less than 5 in the list, then the dropdown was on the button. 2022-12-12 23:38:27 +03:00
9625b10077 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-12 19:58:43 +03:00
c36ba1584a fixed upload room logo to s3 2022-12-12 19:58:21 +03:00
1f5351c4cf Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-12 19:34:08 +03:00
c5a2ac077b Update whitelabel.js 2022-12-12 19:34:04 +03:00
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
5e2d50aa7c fixed upload url 2022-12-12 19:07:30 +03:00
4629d949e2
Merge pull request #1116 from ONLYOFFICE/bugfix/room-logo
Bugfix/room logo
2022-12-12 18:50:54 +03:00
be698591d2 Merge branch 'develop' into bugfix/room-logo 2022-12-12 18:07:59 +03:00
23058b7aa2
Merge pull request #1007 from ONLYOFFICE/feature/fix-whitelable
Feature/fix whitelable
2022-12-12 18:06:21 +03:00
965867e3f5 Merge branch 'develop' into feature/fix-whitelable 2022-12-12 17:22:03 +03:00
b1f6897410 Web: Client: fixed mobile view 2022-12-12 17:12:02 +03:00
273d4cc8d5 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-12 17:02:35 +03:00
f7c7302bd5 Web:Common:Added info panel for Empty Container Room Created. 2022-12-12 17:02:21 +03:00
0b3b69f9f4 Web:Client:Added info panel for Empty Container Room Created. 2022-12-12 17:01:48 +03:00
Akmal Isomadinov
88ad7a7790 Web:Components:Selector:Sub-Components:Item Fixed hover effect on sensor device 2022-12-12 18:54:15 +05:00
Mushka Nikita
7361493054 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-12 15:38:22 +03:00
Mushka Nikita
55598886bb returned feed translations and added new way of getting them 2022-12-12 15:38:15 +03:00