Alexey Safronov c51fb3fe8f Merge branch 'hotfix/v2.6.1' into develop ... # Conflicts: # packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js # packages/client/src/pages/PortalSettings/categories/integration/LDAP/styled-components/StyledLdapPage.js # packages/client/src/pages/Wizard/index.js		2024-09-02 19:28:07 +04:00
..
files	Merge branch 'develop' into feature/display-file-extension	2024-08-06 11:10:27 +05: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	Client:PortalSettings:OAuth: add validate developer token	2024-08-19 17:21:51 +03:00
oforms	Shared: Api: Oforms: Added extension for default forms filter	2024-07-12 14:28:35 +03:00
people	Merge branch 'hotfix/v2.6.1' into develop	2024-09-02 19:28:07 +04:00
plugins	Replaced copyright start year + format	2024-03-21 18:09:55 +04:00
portal	Merge branch 'develop' into feature/ssr-confirm	2024-08-22 16:26:54 +04:00
rooms	Merge branch 'develop' into feature/public-edit	2024-08-05 15:37:22 +04:00
settings	Shared:ApI:Settings: change TSettings type	2024-08-29 19:01:53 +04:00
user	Merge branch 'develop' into feature/ldap-settings	2024-06-17 15:17:07 +04:00
client.ts	Shared:Utils:Axios: add generic for API types	2024-08-15 16:18:59 +03:00
index.ts	Revert "Merge branch 'develop'"	2024-05-28 14:05:49 +03:00