Tatiana Lopaeva 1749f5a9d0 Merge branch 'develop' into feature/user-quota ... # Conflicts: # packages/client/src/components/GlobalEvents/index.js # packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js # packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js # packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableHeader.js # packages/client/src/pages/Home/Section/Filter/index.js # packages/client/src/store/FilesActionsStore.js # packages/client/src/store/PeopleStore.js # packages/client/src/store/index.js # packages/shared/api/people/filter.js # packages/shared/enums/index.ts		2024-02-20 19:43:27 +03:00
..
files	Merge branch 'develop' into feature/user-quota	2024-02-06 11:52:52 +03:00
groups	moved basic feats from feature/account-groups (groups table, inside groups table, api, stores, etc.)	2024-02-14 15:35:17 +03:00
management	Shared:Store:SettingsStore: move from common and rewrite to typescript	2024-01-25 11:17:19 +03:00
modules	Shared:Utils:Common\Api: move from common and rewrite to typescript	2024-01-14 09:13:04 +03:00
oforms	Shared:Utils:Common\Api: move from common and rewrite to typescript	2024-01-14 09:13:04 +03:00
people	Merge branch 'develop' into feature/user-quota	2024-02-20 19:43:27 +03:00
plugins	Shared:API:Plugins: rewrite to typescript	2024-01-29 13:07:28 +03:00
portal	Merge branch 'develop' into feature/user-quota	2024-02-14 12:15:32 +03:00
rooms	Merge branch 'develop' into feature/user-quota	2024-02-20 19:43:27 +03:00
settings	Merge branch 'develop' into feature/user-quota	2024-02-14 12:15:32 +03:00
user	Shared:Utils:Common\Api: move from common and rewrite to typescript	2024-01-14 09:13:04 +03:00
client.ts	Shared:Utils:Common\Api: move from common and rewrite to typescript	2024-01-14 09:13:04 +03:00
index.ts	Fix after merge 'develop'	2024-01-25 17:54:15 +03:00