Commit Graph

31389 Commits

Author SHA1 Message Date
Timofey Boyko
df968b758e Web:Client:Article: remove custom check for disabled state 2023-02-22 12:58:53 +03:00
c8150ac4b0 People: fixed user type filter 2023-02-22 12:54:43 +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
9517d0b644
Merge pull request #1233 from ONLYOFFICE/feature/multi-file-upload
Feature/multi file upload
2023-02-22 13:24:01 +04:00
a8a67d3180 fix build 2023-02-22 12:22:40 +03:00
c7bfe8e1cf Web:Client:Add runInAction. 2023-02-22 12:22:29 +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
3ec8038046 Web: Files: fixed upload 2023-02-22 12:11:19 +03:00
992613b03e Merge branch 'feature/open-location' of github.com:ONLYOFFICE/AppServer into feature/open-location 2023-02-22 11:59:06 +03:00
ebb7a26004 Web:Client:Fixed numeric id conversion for third-party files since they can be strings. 2023-02-22 11:58:56 +03:00
7ff895a739 Merge branch 'develop' into feature/multi-file-upload 2023-02-22 12:58:44 +04:00
38c28bce91 Merge branch 'develop' into bugfix/60994 2023-02-22 11:50:39 +03:00
94698a0794 Web: Files: fixed upload 2023-02-22 11:45:50 +03:00
8a879e2bb1 Merge branch 'develop' into feature/open-location 2023-02-22 12:25:52 +04:00
c6f46c044a
Merge pull request #1231 from ONLYOFFICE/bugfix/Bug-61327
Bugfix/Fixed Bug 61327 - Files.Search. Horizontal scroll on the Search Options panel, if the Author has selected a user with a high level of characters in the name in the group of elements.
2023-02-22 12:13:27 +04:00
d22ed67065
Merge pull request #1229 from ONLYOFFICE/bugfix/delete-extra-group-search
Fixed Bug 61280 - Web: Client: added a check for the trash section to…
2023-02-22 12:11:48 +04: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
b630ec1041 Merge branch 'develop' into feature/browserlist 2023-02-22 10:12:11 +03:00
Timofey Boyko
6ea82302eb Web: add new translation key 'Collaborator' 2023-02-22 10:01:31 +03:00
7786ea38f5
Merge pull request #1232 from ONLYOFFICE/fix/github-action
Modify github action
2023-02-21 21:24:46 +04:00
sk81.biz@gmail.com
5fea6d6fba Change REPO=onlyoffice 2023-02-21 20:21:03 +03:00
1bac194306
Merge pull request #1230 from ONLYOFFICE/bugfix/fixed-table-crash
Web: Files: Fixed Bug 61274 - Files. ‘Something went wrong’ when goin…
2023-02-21 21:10:04 +04: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
Timofey Boyko
069c79485c Web:Client:Profile: add truncate and change width for long user name 2023-02-21 18:04:26 +03:00
Timofey Boyko
f24eef67ca Web:Common:FilterInput: add truncate to filter block item tag text component at author section 2023-02-21 17:54:25 +03:00
bff91bed95 Web: Files: fixed folders upload 2023-02-21 17:15:52 +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