Alexey Safronov 0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign ... # Conflicts: # packages/asc-web-components/modal-dialog/index.js # packages/asc-web-components/themes/dark.js # public/locales/de/Common.json # web/ASC.Web.Client/src/Shell.jsx # web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js # web/ASC.Web.Login/src/Login.jsx		2022-03-16 11:03:07 +03:00
..
files	Web: Files: Fix refresh last page on delete all items (+ socket refactoring)	2022-02-03 14:57:23 +03:00
groups	Web: People/Common: added sorting of groups in the tree	2021-11-16 19:27:27 +03:00
modules	Web: Proxy fixes	2021-03-22 17:35:33 +03:00
people	Web: Common: get user data from confirm	2022-02-09 14:51:01 +03:00
portal	Web:Common:Added setPortalRename request to api portal.	2022-03-02 11:06:08 +03:00
settings	Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign	2022-03-16 11:03:07 +03:00
user	Web: Common: add skipLogout option	2022-03-15 14:33:21 +03:00
client.js	Web: Common: add skipLogout option	2022-03-15 14:33:21 +03:00
index.js	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00