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
..
About.json	Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS	2022-01-21 12:53:29 +03:00
Confirm.json	Web: Client: add welcome translate	2022-02-09 15:23:15 +03:00
Error401.json	Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS	2022-01-21 12:53:29 +03:00
Error403.json	Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS	2022-01-21 12:53:29 +03:00
Error404.json	Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS	2022-01-21 12:53:29 +03:00
ErrorInvalid.json	Web: Client: fix translate	2022-02-21 18:43:35 +03:00
Home.json	Web: Studio: Homepage: Now displayName is used in greeting message	2021-12-14 11:14:08 +03:00
NavMenu.json	Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS	2022-01-21 12:53:29 +03:00
Offline.json	Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS	2022-01-21 12:53:29 +03:00
PaymentsEnterprise.json	Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS	2022-01-21 12:53:29 +03:00
Settings.json	Web:Studio:Changed translation of CustomizationDescription for locales ru. Added translation of CustomizationDescription for locales en.	2022-03-10 17:06:50 +03:00
ThirdParty.json	Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS	2022-01-21 12:53:29 +03:00
ToastHeaders.json	Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS	2022-01-21 12:53:29 +03:00
translation.json	Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS	2022-01-21 12:53:29 +03:00
Wizard.json	Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS	2022-01-21 12:53:29 +03:00