Tatiana Lopaeva 3c23f4d892 Merge branch 'hotfix/v1.1.1' into feature/convert-password ... # Conflicts: # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js # products/ASC.Files/Client/src/store/UploadDataStore.js		2021-12-30 14:34:49 +03:00
..
files	Merge branch 'hotfix/v1.1.1' into feature/convert-password	2021-12-30 14:34:49 +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	Fix displayName of current user after creation/update if user's display name with diacritics	2021-11-13 20:18:58 +03:00
portal	Web: Common: fixed getShortenedLink	2021-03-22 19:18:30 +03:00
settings	Web: Studio: Init Debug Info	2021-10-04 17:08:03 +03:00
user	Web: Login: Added usage of new API /authentication.json parameter "session"	2021-12-01 10:56:50 +03:00
client.js	Merge branch 'develop' into release/1.0.0	2021-09-15 14:45:33 +03:00
index.js	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00