Commit Graph

147 Commits

Author SHA1 Message Date
de122f813e Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-15 21:17:28 +03:00
6438bca15d Web: Files: Fix translation 2022-09-15 20:47:04 +03:00
30618e3e22 Web: Files: Fix translation 2022-09-15 20:43:35 +03:00
TimofeyBoyko
0dba384037 Merge branch 'develop' into feature/redesign-personal-filter 2022-09-15 14:29:57 +03:00
TimofeyBoyko
8480a1f525 Web:Client:Home: add new translation key 'ByLastModifiedDate' for filter sort 2022-09-15 14:08:18 +03:00
TimofeyBoyko
fe98362066 Web:Client: change translation key 'ByLastModifiedDate' to 'ByLastModified' 2022-09-15 14:07:02 +03:00
TimofeyBoyko
1ca5819e0f Web:Client:Home: add new translation key 'ByCreationDate' for filter sort 2022-09-15 14:05:51 +03:00
TimofeyBoyko
977dc1f7ed Web:Client: change translation key 'ByCreationDate' to 'ByCreation' 2022-09-15 14:02:53 +03:00
TimofeyBoyko
11ba9f379c Merge branch 'develop' into feature/redesign-personal-filter 2022-09-14 16:35:18 +03:00
TimofeyBoyko
d65255f47d Web:Client:Home: chage translation key 'MasterForms' to 'FormsTemplates' 2022-09-14 16:31:20 +03:00
28a3096a25 Web: Files: Settings: styling + new translations 2022-09-14 12:37:33 +03:00
f3412fa2f8 Merge branch 'develop' into feature/redisign-files-settings 2022-09-14 11:20:37 +03:00
033259116f Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/common/settingsAppearance/preview.js
2022-09-14 01:15:03 +03:00
8030f66036 Web: Fix translations 2022-09-13 17:23:52 +03:00
795e76f9d5 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-13 16:42:09 +03:00
TimofeyBoyko
42d6b3e7d3 Web: add new translation keys 2022-09-13 13:47:40 +03:00
TimofeyBoyko
2f940452ad Merge branch 'develop' into feature/redesign-personal-filter 2022-09-13 11:08:51 +03:00
d94918a1de Merge branch 'develop' into feature/additional-resources 2022-09-13 10:52:26 +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
88e8218bf4 Web:Client:Delete ModalDialog. 2022-09-12 12:50:53 +03:00
7540d85405 Web:Client:Add "WhiteLabelSubtitle", "WhiteLabelHelper", "WhiteLabelTooltip". 2022-09-12 12:29:17 +03:00
TimofeyBoyko
939b3651df Web:Client:Locales: fix translation key for filter header 2022-09-12 11:52:32 +03:00
8db56ce0ad Web:Client:Add locales "ShowFeedbackAndSupport","ShowSampleDocuments","ShowVideoGuides","ShowHelpCenter". 2022-09-10 20:45:03 +03:00
377d3be960 Merge branch 'develop' into feature/additional-resources 2022-09-10 19:46:57 +03:00
8df94b6af1 i18n: Translations: fix project files + sorting 2022-09-09 18:02:39 +03:00
4b3f9f7e29 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/components/dialogs/index.js
2022-09-09 17:34:19 +03:00
310a189a66 Web:Client:Add locales "AdditionalResourcesDescription","DocSpaceMenu". 2022-09-09 12:34:31 +03:00
05c01d85e6 Web: Fix toast translations (Remove room(s) issue) 2022-09-09 11:22:04 +03:00
TimofeyBoyko
ec0e91ee99 Merge branch 'feature/change-owner-dialog' of github.com:ONLYOFFICE/DocSpace into feature/change-owner-dialog 2022-09-08 18:36:04 +03:00
TimofeyBoyko
eaea59943c Web:Client:ChangePortalOwner: add new translation key 'ChooseFromList' 2022-09-08 18:23:57 +03:00
TimofeyBoyko
07c7352604 Web:Client:Locales: clone translation for ChangePortalOwner 2022-09-08 18:19:46 +03:00
06803de440 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/components/dialogs/BackupCodesDialog/index.js
#	packages/client/src/pages/My/index.js
#	packages/client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	packages/client/src/pages/Profile/Section/Body/index.js
#	packages/client/src/pages/ProfileAction/Section/Body/avatarEditorPage.js
#	packages/client/src/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
#	packages/client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	packages/client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	packages/client/src/pages/ProfileAction/index.js
2022-09-08 17:31:12 +03:00
TimofeyBoyko
1b3fbb3129 Web:Client:ChangePortalOwnerDialog: split translation key 'OwnerRights' 2022-09-08 16:55:00 +03:00
97bd153ec5
Merge branch 'develop' into feature/change-owner-dialog 2022-09-08 16:29:09 +03:00
TimofeyBoyko
8334d4e3e6 Web:Client:ChangePortalOwnerdialog: fix translation key 2022-09-08 16:14:48 +03:00
TimofeyBoyko
4c27fb0c02 Web:Client:ChangePortalOwnerDialog: fix translation 2022-09-08 15:14:48 +03:00
TimofeyBoyko
41873e3c69 Web:Client:ChangePortalOwnerDialog: fix translation keys and theme 2022-09-08 14:45:52 +03:00
TimofeyBoyko
0aba1e4a95 Web:Client:Locales: add new translation keys for change portal owner 2022-09-08 14:01:09 +03:00
024826b64a Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-08 13:09:25 +03:00
5954c20c37 Web: Translations: Moved all toasts title translations to Common.json 2022-09-08 12:10:33 +03:00
TimofeyBoyko
ac496bfe9e Merge branch 'develop' into feature/selector 2022-09-07 15:06:24 +03:00
TimofeyBoyko
d8a6315417 Web:Client:Locales: fix RoomSelector translation key 2022-09-07 13:33:19 +03:00
5e6ad92dc2 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-06 13:31:32 +03:00
f66c0bb91f Web: Client: Renamed locale folders 2022-09-06 13:18:35 +03:00
90457c3d76 Client: add translate 2022-09-05 22:41:55 +03:00
TimofeyBoyko
6c632497f9 Merge branch 'develop' into feature/selector 2022-09-05 20:33:29 +03:00
TimofeyBoyko
f5030ea73d Web:Locales:RoomSelector: add new translation keys 2022-09-05 19:51:50 +03:00
661d39e5a6 Web: Locales: PeopleSelector: Added new translation keys 2022-09-05 18:17:17 +03:00
bcdc2993c6 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/pages/My/i18n.js
#	packages/client/src/pages/Profile/Section/Body/index.js
2022-09-05 16:47:09 +03:00
2a4fa1862f
Merge branch 'develop' into feature/dns-settings 2022-09-05 16:31:17 +03:00