Viktor Fomin 331ab31e02 Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail ... # Conflicts: # web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/passwordStrength.js # web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/tfa.js		2022-04-05 11:18:28 +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 translates	2022-03-28 14:40:32 +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
PreparationPortal.json	merge	2022-03-24 20:56:51 +03:00
Settings.json	Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail	2022-04-05 11:18:28 +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