Commit Graph

47574 Commits

Author SHA1 Message Date
0b34ae0b1e Merge branch 'develop' into feature/security-active-sessions
# Conflicts:
#	packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
#	yarn.lock
2024-07-17 11:41:47 +05:00
54a5b93ac0 Merge branch 'release/v2.6.0' into develop
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectFileStep/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js
2024-07-16 12:59:23 +04:00
9f9d2bdbb7 Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0 2024-07-16 10:34:00 +03:00
01fd1ae447 Shared:Components:Selector: fix background for footer 2024-07-16 10:33:56 +03:00
7c6b69aef5
Merge pull request #539 from ONLYOFFICE/refactoring/data-import
Refactoring/data import
2024-07-16 11:33:18 +04:00
d286eab6b1
Merge pull request #550 from ONLYOFFICE/bugfix/modal-dialog
bugfix/modal-dialog
2024-07-16 11:26:16 +04:00
afdf1ed929 Merge branch 'release/v2.6.0' into bugfix/modal-dialog 2024-07-16 11:13:34 +04:00
accb6beb32 Fix Bug 69211 - Settings: Data Import: OnlyOffice WS and NextCloud, can select several archives at a time 2024-07-16 12:06:54 +05:00
b379ab5296 Fix Bug 69175 - Settings: Import. At the second import step, the tooltip is missing the variable for the maximum number of users (always 100) 2024-07-16 11:24:28 +05:00
a6dd54ed5b Shared: Components: TableHeader: fix crash 2024-07-16 10:22:17 +05:00
71e4abc4ad Merge branch 'develop' into refactoring/data-import
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersTypeStep/AccountsTable/index.tsx
2024-07-16 10:03:45 +05:00
04f887811b Client: TilesView: fix style 2024-07-16 01:46:54 +03:00
f2a8dd9b20 Client: LDAP: fix selector style 2024-07-16 01:37:13 +03:00
3030c2ff03 Client: Integration: fix sticky 2024-07-16 00:44:37 +03:00
12954abcd7 Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0 2024-07-15 20:33:01 +03:00
44f478c6d1 Client:Store:SelectedFolderStore: fix inRoom 2024-07-15 20:32:57 +03:00
43e722ea8f Client: fix creation room with new tags 2024-07-15 20:59:34 +04:00
97a4ecc0b5 Fix confirm PortalSuspend/PortalContinue loading if authenticated 2024-07-15 20:06:53 +04:00
ff2beed197 Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0 2024-07-15 19:59:59 +04:00
0af0df21a5 InvitePanel: fix styles by new makets (issue 27) 2024-07-15 19:59:54 +04:00
c4e515d99d Shared:Components:Selector: change onBackClick to onClearSearch for search empty screen 2024-07-15 18:43:04 +03:00
28f99ca87d Client:Store:InfoPanelStore: delete console log 2024-07-15 18:31:54 +03:00
66d8f3dd9f Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0 2024-07-15 18:29:39 +03:00
45bfe79d0a Client:Store: open member tab at info panel after open from header context menu 2024-07-15 18:29:35 +03:00
7e823581f5 Web: Files: EmbeddingPanel: fixed styles 2024-07-15 18:16:06 +03:00
9621306ca8 Web: Files: MoveToPublicRoomDialog is disabled for public files 2024-07-15 18:01:49 +03:00
98eccb51f8 Client: fixed transition to the group list after reloading the page/opening in a new tab 2024-07-15 20:00:35 +05:00
280107b3b9 Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0 2024-07-15 17:57:28 +03:00
1f714c343c Client: Components: Main: Fixed event. 2024-07-15 17:56:54 +03:00
af1f125f1a Fixed page scrolling outside the dialog if there is focus. 2024-07-15 17:53:15 +03:00
660e5ba013 Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0 2024-07-15 17:52:20 +03:00
b7fc07f100 Client:Store:ContextOptionsStore: group move, copy and duplicate for info panel 2024-07-15 17:52:14 +03:00
540243fa8e Web: Files: fixed embedding combobox 2024-07-15 17:34:30 +03:00
34ee4d4341 Client: RemovePortal: fix redirect url 2024-07-15 17:32:42 +03:00
aa5358ab6c Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0 2024-07-15 17:01:06 +03:00
b2e0628d91 Client:Helpers:Utils: fix category type for /rooms/shared 2024-07-15 17:00:52 +03:00
77f1ae829c Client: SSO: fix style 2024-07-15 16:06:54 +03:00
a53c46cf25 Client: Profile: use portal for context menu 2024-07-15 14:59:11 +03:00
54aa929b91 Client: change wrong console method 2024-07-15 15:58:48 +04:00
08cd6a6ffb Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0 2024-07-15 15:55:42 +04:00
9efe18f60c Fix Bug 68285 - Rooms.InviteUsers. There is no redirection to the room when clicking on the invitation link 2024-07-15 15:55:34 +04:00
99ac5f81b1 Shared: Table: fix hover 2024-07-15 14:53:49 +03:00
4754dbdf3e Client: fix open location 2024-07-15 14:49:19 +03:00
b58483b775 Fix bug 69200 - Client: removed the extra setSelectedFolder call 2024-07-15 16:16:23 +05:00
f9c9feef73 Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0 2024-07-15 12:54:19 +03:00
8985155907 Fix Bug 69189 - The Storage/Quota line is missing on Info/History called inside the room. 2024-07-15 12:53:14 +03:00
15d1263a20 Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0 2024-07-15 13:38:34 +04:00
6aafbcf45a Fix Bug 69185 - Accounts. For an account in the Pending invite status, there is no Disable action in the three-dot action menu 2024-07-15 13:38:21 +04:00
7b9b9d9f2a Fixed Bug 69183 - Accounts. In the pop-up notification when the portal owner changes, the recipient of the letter is incorrectly specified 2024-07-15 11:53:04 +03:00
2cbf6f4db9 Fixed Bug 69183 - Accounts. In the pop-up notification when the portal owner changes, the recipient of the letter is incorrectly specified 2024-07-15 11:33:06 +03:00