Commit Graph

31193 Commits

Author SHA1 Message Date
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
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
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
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
Timofey Boyko
97dead7a73 Web:Common:Article: hide accounts for collaborator 2023-02-22 10:44:51 +03:00
Timofey Boyko
769abeb9e9 Web:Common:Constants: add new role and type 'Collaborator' 2023-02-22 10:39:55 +03:00
Timofey Boyko
6ea82302eb Web: add new translation key 'Collaborator' 2023-02-22 10:01:31 +03:00
ca2c9e8b57 Files: refactor 2023-02-21 19:39:00 +03:00
f1d98ce6fd Files: fixed invitation in room 2023-02-21 19:38:47 +03:00
abbd2b837e File: fixed user in room count 2023-02-21 19:38:26 +03:00
5a65b42177 Core: fixed invite 2023-02-21 19:00:25 +03:00
068be391cd Web.Core: fixed invite 2023-02-21 19:00:12 +03:00
3401abb21a Merge branch 'develop' into feature/colloborator 2023-02-21 17:11:39 +03:00
071456c9f3 Files: refactor, fixed for docspace admin 2023-02-21 17:09:28 +03:00
be2bd8d1ac Files: fixed rights for docspace admin 2023-02-21 17:08:26 +03:00
bf9629a9c0 Update 4testing-multi-build.yml 2023-02-21 18:06:56 +04:00
ca5d711c36 People: refactor 2023-02-21 16:53:48 +03:00
6d3cda4b7f Files: refactor 2023-02-21 16:53:35 +03:00
582c6a602b Core: added new helper methods 2023-02-21 16:37:33 +03:00
94062792d5 People: added collaborator, refactor 2023-02-21 16:35:57 +03:00
fafc8b567d Files: added collaborator role 2023-02-21 16:34:06 +03:00
306f08b123 Files: added collaborator role, added rights rules, refactor 2023-02-21 16:33:41 +03:00
24178d9a13 Files: changed error message 2023-02-21 16:23:50 +03:00
007733dfeb Files: removed unnecessary 2023-02-21 16:23:28 +03:00
cb398c0a51 Files: changed error message 2023-02-21 16:20:44 +03:00
a3da42b064
Merge pull request #1157 from ONLYOFFICE/feature/fix-webhooks-second
Feature/fix webhooks second
2023-02-21 15:38:28 +03:00
0787427bce fix 2023-02-21 15:12:57 +03:00
1c3d3bf132 Merge branch 'develop' into feature/fix-webhooks-second
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
2023-02-21 14:33:26 +03:00
Sergey Kirichenko
44f6912f50
Add tag prefix for docker images (#1217) 2023-02-21 16:26:59 +05:00
3269d48e15 added new table 2023-02-21 14:22:34 +03:00
9cb5022d0b
Merge pull request #1226 from ONLYOFFICE/bugfix/trash-room-title
Fixed Bug 61270 - Web: Client: added a dash if there is no title in t…
2023-02-21 14:38:13 +04:00
b362851047 Fix Bug 61275 - Files.Trash.Info. Extra separator line in the file menu in the Info panel. 2023-02-21 13:46:38 +04:00
125a0169cf
Merge pull request #1228 from ONLYOFFICE/bugfix/Bug61132
Bugfix/bug61132
2023-02-21 12:41:29 +04:00
Viktor Fomin
9aba24e4e8 Client: PeopleSelector: fix translate, use dark image 2023-02-21 11:14:45 +03:00
Viktor Fomin
214cb0a89c Components: Themes: fix color 2023-02-21 11:13:45 +03:00
Viktor Fomin
84533d7ca0 Web: delete useless images 2023-02-21 10:52:24 +03:00
DmitrySychugov
34bca3442a Merge branch 'develop' into bugfix/trash-room-title 2023-02-21 12:39:53 +05:00
DmitrySychugov
0f34d4e9b8 Web: Client: replaced the component with a dash 2023-02-21 12:36:47 +05:00
Viktor Fomin
b172b5a1f4 Client: InfoPanel: fix style 2023-02-21 08:57:07 +03:00