Commit Graph

8851 Commits

Author SHA1 Message Date
c932d935fa Merge branch 'develop' into feature/colloborator 2023-02-28 13:48:08 +04:00
Timofey Boyko
a12252e3eb Web:Client:InfoPanel: fix history block for collaborator 2023-02-28 12:27:34 +03:00
Timofey Boyko
7cc87a6853 Web:Client:InfoPanel: add tooltip for user role 2023-02-28 11:38:46 +03:00
Timofey Boyko
da9cb94b08 Web:Components:Avatar: add tooltip on hover role icon 2023-02-28 11:29:05 +03:00
Timofey Boyko
fcf71e3c94 Web:Client:Utils: fix filterUserRoleOptions 2023-02-28 10:51:14 +03:00
1a3dfba635 Fix Bug 61108 - Accounts. Uncaught (in promise) Error: Request aborted on logout in FireFox browser 2023-02-28 11:21:01 +04:00
Timofey Boyko
cd67d8fef1 Web:Common:API: fix invitation links 2023-02-28 10:18:57 +03:00
Timofey Boyko
56d778dd39 Merge branch 'develop' into feature/colloborator 2023-02-27 18:37:18 +03:00
6224902959 Web: Files: Upload panel: fixed files list 2023-02-27 16:41:54 +03:00
Timofey Boyko
8e59451b4a Merge branch 'develop' into feature/colloborator 2023-02-27 15:22:21 +03:00
Timofey Boyko
abe88e6ddd Web:Client: fix access options for DocSpace admins and DocSpace owner 2023-02-27 15:21:28 +03:00
Timofey Boyko
1343c93db5 Web:Common:Utils: add new role 'Collaborator' 2023-02-27 15:21:04 +03:00
Timofey Boyko
bcec1a9617 Web:Client:Utils: add filterUserRoleOptions function 2023-02-27 14:57:05 +03:00
Timofey Boyko
0dc9574b01 Web:Components:Avatar: fix width 2023-02-27 14:32:06 +03:00
Timofey Boyko
c55c2ffab2 Web:Client:AddUsersPanel: add correct role for DocSpace admin and DocSpace owner 2023-02-27 14:18:44 +03:00
Timofey Boyko
ed407991d3 Web:Client:PeopleSelector: add isOwner, isAdmin, isVisitor, isCollaborator for user 2023-02-27 13:53:19 +03:00
Timofey Boyko
0862cef9a6 Web:Components:Selector: pass more item props to parent component 2023-02-27 13:52:33 +03:00
Timofey Boyko
ff547ea1e5 Web:Client:InfoPanel:Members: show active user role 2023-02-27 12:25:32 +03:00
Viktor Fomin
64484eaa29 Editor: xss protection 2023-02-27 12:23:12 +03:00
Timofey Boyko
240f9fa9c3 Web:Components:Combobox: fix active items 2023-02-27 12:22:46 +03:00
Viktor Fomin
d7da99b027 Merge branch 'develop' into bugifx/Bug61352 2023-02-27 11:51:40 +03:00
0526bab217 Web: Files: fixed upload-panel progress 2023-02-27 11:20:13 +03:00
Viktor Fomin
1914cfd98f Fix Bug 61352: login xss 2023-02-24 23:47:36 +03:00
Timofey Boyko
3a280b8486 Web:Client:EmptyContainer: update empty screen for collaborator 2023-02-22 17:14:24 +03:00
Timofey Boyko
5ac78e3eb4 Web: disable routes for collaborator 2023-02-22 16:53:59 +03:00
aad577d0cc
Merge pull request #1236 from ONLYOFFICE/feature/invite-panel-texts
Web: Client: InvitePanel: Added descriptions
2023-02-22 16:36:52 +03:00
d69084d736 Web: Client: InvitePanel: Fixed translations 2023-02-22 16:35:43 +03:00
Timofey Boyko
e8119fbbf2 Web:Client:InfoPanel: add new type and role 2023-02-22 16:26:55 +03:00
Timofey Boyko
fde57625c1 Web:Common:Loaders: fix filter block loader for accounts 2023-02-22 16:10:49 +03:00
Timofey Boyko
7c6d99d122 Web:Client:Accounts: add new user type for filter 2023-02-22 16:10:17 +03:00
Timofey Boyko
f5c8b9d051 Web:Client: add new type and role at invite panel 2023-02-22 15:57:27 +03:00
Timofey Boyko
89bf5322a5 Web:Client: add new translation key for collaborator 2023-02-22 15:56:51 +03:00
Timofey Boyko
dda368ace1 Web:Client:InfoPanel: add new type to acctounts view 2023-02-22 15:47:29 +03:00
Timofey Boyko
97cd50eb87 Web:Client:Accounts: add new user type 'Collaborator 2023-02-22 15:36:57 +03:00
Timofey Boyko
9c1a5d9aed Web:Client:AccessRightsStore: add new role 'Collaborator' 2023-02-22 15:36:34 +03:00
6ee6ce7d21 Web: Client: InvitePanel: Added descriptions 2023-02-22 15:16:45 +03:00
Timofey Boyko
3373b84bd9 Web:Client:UsersStore: fix user context menu 2023-02-22 14:51:58 +03:00
Timofey Boyko
e60e6ce01d Web:Client:UsersStore: fix user list 2023-02-22 14:40:44 +03:00
Timofey Boyko
cfd53207a1 Web:Client:UsersStore: update with new role and type 2023-02-22 14:08:17 +03:00
Timofey Boyko
9a00f94d2b Web:Components:Avatar: add new role 'Collaborator' 2023-02-22 14:07:55 +03:00
5784da44ca Fixed Bug 61315 - Files.Convert. Fixed duplicate files in the list after conversion 2023-02-22 14:07:29 +03:00
Timofey Boyko
9b08b4f4f8 Web:Client:Article: delete useless code and change collaborator icon 2023-02-22 13:43:10 +03:00
Timofey Boyko
5a5b63d099 Web:Client:Header: remove custom checks and add security 2023-02-22 13:36:35 +03:00
Timofey Boyko
4d9e531539 Web:Common:Navigation: fix displaying context menu 2023-02-22 13:36:09 +03:00
Timofey Boyko
df968b758e Web:Client:Article: remove custom check for disabled state 2023-02-22 12:58:53 +03:00
94b871dd70
Merge pull request #1234 from ONLYOFFICE/bugfix/empty-images-size
bugfix/empty-images-size
2023-02-22 13:45:45 +04:00
Viktor Fomin
5dd19ad757 Client: InfoPanel: fix images size 2023-02-22 12:42:53 +03:00
Timofey Boyko
0e388d4407 Web:Client: delete useless store 2023-02-22 12:29:57 +03:00
Timofey Boyko
396cb474b1 Web:Client:Article: fix disable state for main button and fix for new user type 2023-02-22 12:27:30 +03:00
5f10f28b0d Merge branch 'feature/multi-file-upload' of github.com:ONLYOFFICE/AppServer into feature/multi-file-upload 2023-02-22 12:11:23 +03:00