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
..
files	Merge branch 'develop' into feature/public-edit	2024-08-01 16:34:06 +03:00
groups	Client: EditGroupStore: Fix moving manager to members without setting new manager	2024-08-13 17:45:19 +02:00
management	Client:OAuth: refactoring	2024-06-26 15:19:13 +03:00
modules	Replaced copyright start year + format	2024-03-21 18:09:55 +04:00
oauth	Shared: AOuth: fix axios response data	2024-07-12 11:37:27 +04:00
oforms	Shared: Api: Oforms: Added extension for default forms filter	2024-07-12 14:28:35 +03:00
people	Shared: Api: People: Added loginEventId to user type	2024-08-05 17:58:59 +03:00
plugins	Replaced copyright start year + format	2024-03-21 18:09:55 +04:00
portal	Merge branch 'hotfix/v2.6.1' into feature/api-separation	2024-08-08 14:38:16 +04:00
rooms	Merge branch 'develop' into feature/public-edit	2024-08-05 15:37:22 +04:00
settings	Merge branch 'hotfix/v2.6.1' into develop	2024-08-12 19:10:02 +04:00
user	Merge branch 'develop' into feature/ldap-settings	2024-06-17 15:17:07 +04:00
client.ts	Shared: AOuth: fix axios response data	2024-07-12 11:37:27 +04:00
index.ts	Revert "Merge branch 'develop'"	2024-05-28 14:05:49 +03:00