Commit Graph

7 Commits

Author SHA1 Message Date
Elyor Djalilov
34954cd9e0 Fix bad merge 2022-11-25 17:51:13 +05:00
Elyor Djalilov
b8348af578 Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
#	packages/client/public/locales/en/DeleteDialog.json
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/en/InfoPanel.json
#	packages/client/public/locales/en/InviteDialog.json
#	packages/client/public/locales/en/Payments.json
#	packages/client/public/locales/en/Profile.json
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/en/Translations.json
#	packages/client/public/locales/ru/Files.json
#	packages/client/public/locales/ru/InfoPanel.json
#	packages/client/public/locales/ru/Payments.json
#	packages/client/src/components/GlobalEvents/RenameEvent.js
#	packages/client/src/pages/Home/Section/Filter/index.js
2022-11-25 16:27:23 +05:00
f897d9dd95 Web: Client: Locales: Added "InviteUsers" key and remove duplicates of "RoleRoomAdmin" and "RoleDocSpaceAdmin" 2022-10-27 09:37:56 +03:00
073aa9943f Fix WrongTranslationVariablesTest issues + added missing files and key sorting 2022-10-25 14:52:15 +03:00
c54817bfb1 Web: Client: InvitePanel: Fixed search result styles, added memo list. Fixed events on validating input value. Added "Сhoose from list" option 2022-08-31 14:17:38 +03:00
6b25c3d7af Web: Client: InvitePanel: Added invitePanel at DialogsStore, added translation keys at InviteDialog, fixed adding and deleting operation with invite list, fixed styles of icons 2022-08-30 18:08:58 +03:00
f9640a400c Web: Moved 'People' images and translations to 'Client' 2022-07-25 10:29:16 +03:00