Alexey Safronov 4ce9acce3d Merge branch 'develop' into feature/sso ... # Conflicts: # products/ASC.Files/Server/DocStore		2022-07-22 17:23:36 +03:00
..
files	Web:Common:Api: move decodeDisplayName function from files api to utils	2022-07-08 18:20:25 +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:Api: add new api method 'changeTheme'	2022-04-21 10:23:06 +03:00
portal	merge	2022-03-24 20:56:51 +03:00
rooms	Web:Api: add withoutTags for rooms filter	2022-07-20 15:20:56 +03:00
settings	Merge branch 'develop' into feature/sso	2022-07-21 13:07:36 +03:00
user	Web: Common: API: add skipLogout option	2022-03-31 22:34:32 +03:00
client.js	Web: Common: API: fix request	2022-07-04 11:56:22 +03:00
index.js	Web:Common:Api: add new rooms filter and get rooms api method	2022-06-23 12:52:09 +03:00