Alexey Safronov 3dac1a4874 Merge branch 'hotfix/v2.6.1' into develop ... # Conflicts: # packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js # packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js # packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/index.js # packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js # packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js # packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/RowView/UsersRowContent.tsx # packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/TableView/UsersTableRow.tsx # packages/shared/components/share/sub-components/LinkRow.tsx		2024-08-14 12:47:36 +04:00
..
app	Fix Bug 69046 - Rooms. Added password dialog for public files	2024-08-02 13:17:03 +03:00
components	Merge branch 'hotfix/v2.6.1' into develop	2024-08-14 12:47:36 +04:00
hooks	Editor: Fixed s:logout-session socket event	2024-08-06 14:42:27 +03:00
providers	Doceditor: Fixed rtl	2024-07-24 15:59:57 +05:00
styles	DocEditor: refactor rtl	2024-07-16 10:30:33 +02:00
types	Fixed bug 66037: Settings: Active Sessions: When active sessions end, document opened for editing in another user session does not close.	2024-08-05 18:01:14 +03:00
utils	Fix Bug 69046 - Rooms. Added password dialog for public files	2024-08-02 13:17:03 +03:00
middleware.ts	Doceditor: fix health check for localhost	2024-07-10 11:20:29 +03:00