Elyor Djalilov
|
bc729a8847
|
Fix bad merge
|
2022-11-26 13:47:40 +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 |
|
|
|
2414cc030c
|
Web: Client: InvitePanel: Fixes after merge
|
2022-10-10 12:37:02 +03:00 |
|
|
|
bcf6fbb358
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-13 12:12:48 +03:00 |
|
|
|
9fcccfaa42
|
Web: Client: Locales: Added translations for roles
|
2022-09-12 18:47:50 +03:00 |
|
|
|
16a9dc020d
|
Web: Files: fixed catalog-header translation, moved "Other" translation to Translations.json, added "Rooms" translation
|
2022-09-12 14:32:54 +03:00 |
|
TimofeyBoyko
|
eaea59943c
|
Web:Client:ChangePortalOwner: add new translation key 'ChooseFromList'
|
2022-09-08 18:23:57 +03:00 |
|
|
|
c956d8b696
|
Web: Merged 'Files' module with 'Client' and fixed paths
|
2022-07-24 19:57:03 +03:00 |
|
