Commit Graph

31178 Commits

Author SHA1 Message Date
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
Viktor Fomin
013427b909 Client: InfoPanel: fix margin 2023-02-21 08:47:34 +03:00
Viktor Fomin
81cd9cb6e5 Client: fix translate 2023-02-21 08:46:17 +03:00
Viktor Fomin
dbc8ad4373 Merge branch 'develop' into bugfix/Bug61132 2023-02-21 02:31:38 +03:00
Viktor Fomin
823eb4724e Client: InfoPanel: redesign empty state 2023-02-21 02:31:32 +03:00
0a5d19a8f4 nlog: refactoring. added tenant info when httpcontext exist 2023-02-20 23:13:18 +03:00
5e9f12a797 backend: refactoring 2023-02-20 23:10:49 +03:00
42f1db849e Revert "Fix Bug 61274 - Files. ‘Something went wrong’ when going to My Documents after opening the Info panel in the Recycle Bin."
This reverts commit cee9f0a5f1.
2023-02-20 23:44:06 +04:00
cee9f0a5f1 Fix Bug 61274 - Files. ‘Something went wrong’ when going to My Documents after opening the Info panel in the Recycle Bin. 2023-02-20 23:33:33 +04:00
Viktor Fomin
00fd531d79 Merge branch 'develop' into bugfix/Bug61132 2023-02-20 21:43:29 +03:00
Viktor Fomin
739ed41465 Client: InfoPanel: use dark images 2023-02-20 21:43:23 +03:00
DmitrySychugov
b8ad1fd4e9 Web: Client: fixed styled empty room title padding 2023-02-20 23:29:10 +05:00
7bfca4d7fb
Merge pull request #1225 from ONLYOFFICE/bugfix/fixed-dbclick-zoom
Bugfix/fixed dbclick zoom
2023-02-20 22:24:08 +04:00
DmitrySychugov
d05d7271dc Merge branch 'develop' into bugfix/fixed-dbclick-zoom 2023-02-20 23:14:35 +05:00
f716fc6a78 Merge branch 'develop' into bugfix/trash-room-title 2023-02-20 22:09:39 +04:00
75401a064d
Merge pull request #1218 from ONLYOFFICE/bugfix/Bug-61100
Bugfix/bug 61100
2023-02-20 21:54:59 +04:00