|
|
866e7d616f
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-12 11:44:47 +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 |
|
|
|
0b496e4e3c
|
Web:Client:Add locales "ArchiveEmptyScreen", "ArchiveEmptyScreenHeader".
|
2022-09-09 16:06:15 +03:00 |
|
mushka
|
ab7ace5af6
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-09 13:22:36 +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 |
|
mushka
|
20f2fde176
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-08 15:28:38 +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 |
|
mushka
|
0a2318ea59
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-05 20:53:35 +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 |
|
mushka
|
f0956da7d0
|
translated keys in /Files to russian (for context options)
|
2022-09-05 18:02:56 +03:00 |
|
mushka
|
26b180e002
|
added new translation keys to en/Files (for context options)
|
2022-09-05 18:02:24 +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 |
|
TimofeyBoyko
|
a0df5d9a80
|
Web:Client: delete useless
|
2022-09-05 12:22:21 +03:00 |
|
|
|
fd803d8e06
|
Client: add translation
|
2022-09-03 16:03:58 +03:00 |
|
TimofeyBoyko
|
41012a2919
|
Web:Client: add transltaion keys for user selector
|
2022-09-02 16:03:34 +03:00 |
|
|
|
e84ba1ff80
|
Merge branch 'develop' into feature/dns-settings
|
2022-09-02 13:05:58 +03:00 |
|
|
|
3d5447bfa2
|
Web:Added translations for dns.
|
2022-09-02 12:37:00 +03:00 |
|
|
|
8ce30932a3
|
Merge branch 'develop' into feature/login-ssr
|
2022-09-02 10:10:26 +03:00 |
|
|
|
8db5a16495
|
Client: add translation
|
2022-09-02 02:52:45 +03:00 |
|
|
|
89f9e10f84
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-09-02 01:24:12 +03:00 |
|
Tatiana Lopaeva
|
f6d2c6e5b4
|
Merge branch 'develop' into feature/edit-ThirdPartyResourceDescription
|
2022-09-01 11:50:46 +03:00 |
|
|
|
8de4c5ee34
|
edited ThirdPartyResourceDescription zh-CN
|
2022-09-01 11:04:03 +03:00 |
|
Artem Tarasov
|
a845244ee0
|
Merge branch 'develop' into feature/login-ssr
|
2022-09-01 01:51:29 +03:00 |
|
|
|
47f4c557b4
|
edited key: ThirdPartyResourceDescription
|
2022-08-31 17:22:23 +03:00 |
|
Artem Tarasov
|
4ac1eb4c5c
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/IndicatorLoader/index.js
# packages/client/src/components/QuickButtons.js
# packages/client/src/components/panels/UploadPanel/SubComponents/LoadingButton.js
# packages/client/src/pages/About/AboutContent.js
# packages/client/src/pages/Confirm/sub-components/activateEmail.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/VersionHistory/Section/Body/VersionBadge.js
# packages/client/src/store/TargetUserStore.js
# packages/common/components/ColorTheme/ColorTheme.js
# packages/common/components/FilterInput/sub-components/FilterBlockItem.js
# packages/common/components/FilterInput/sub-components/FilterButton.js
# packages/common/components/FloatingButton/FloatingButton.js
# packages/common/components/Navigation/sub-components/item.js
# packages/common/store/AuthStore.js
# packages/components/badge/index.js
# packages/components/button/index.js
# packages/components/calendar/index.js
# packages/components/catalog-item/index.js
# packages/components/combobox/sub-components/combo-button.js
# packages/components/input-block/index.js
# packages/components/main-button/index.js
# packages/components/submenu/index.js
# packages/components/tabs-container/index.js
# packages/components/text-input/text-input.js
# packages/components/textarea/index.js
# packages/components/toggle-button/index.js
# packages/login/src/Login.jsx
|
2022-08-31 16:25:55 +03:00 |
|
TimofeyBoyko
|
8bda52c489
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 11:38:34 +03:00 |
|
TimofeyBoyko
|
938d354ae9
|
Web:Accounts: fix translation for info panel
|
2022-08-31 10:12:03 +03:00 |
|
Artem Tarasov
|
0621fd9c86
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/components/dialogs/ConnectDialog/index.js
# packages/login/src/Login.jsx
# packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# yarn.lock
|
2022-08-30 18:38:12 +03:00 |
|
|
|
778b27ed5c
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 12:55:38 +03:00 |
|
|
|
547c1782f1
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
|
2022-08-30 12:34:48 +03:00 |
|
|
|
605aee5529
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 11:55:19 +05:00 |
|
|
|
dc3ba67fea
|
Web: Client: added DownloadReportBtn ru translation
|
2022-08-30 11:53:06 +05:00 |
|
Vlada Gazizova
|
2f822b0406
|
Merge branch 'develop' into feature/settings-common
|
2022-08-29 22:27:08 +03:00 |
|
TimofeyBoyko
|
2c3dd7276d
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 18:22:45 +03:00 |
|
|
|
8ab27efaef
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-08-29 17:19:16 +03:00 |
|
mushka
|
435e15b217
|
added enw translation keys for dropzone
|
2022-08-29 13:49:43 +03:00 |
|
mushka
|
3807afb3ea
|
added missing translation key
|
2022-08-29 13:40:08 +03:00 |
|
TimofeyBoyko
|
fa26f74d96
|
Web:Client: change locales for context menu options of users
|
2022-08-29 12:22:19 +03:00 |
|
|
|
e3e47364e0
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-29 13:36:09 +05:00 |
|
TimofeyBoyko
|
937d99249e
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 09:47:42 +03:00 |
|
|
|
17a557e96a
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-08-28 00:12:05 +03:00 |
|
Vlada Gazizova
|
302e2e655a
|
Merge branch 'develop' into feature/settings-common
|
2022-08-27 12:17:44 +03:00 |
|
Artem Tarasov
|
0a3ebbc436
|
Web: Login: translations for InvalidError moved to login
|
2022-08-27 01:48:29 +03:00 |
|
mushka
|
56c2cd64c5
|
Merge branch 'develop' into feature/create-room
|
2022-08-26 19:28:06 +03:00 |
|
|
|
a9b8a64e61
|
Web: Added translation for rooms module.
|
2022-08-26 18:59:28 +03:00 |
|
|
|
2bfa12f8b6
|
Web: Changed translations, deleted useless translations.
|
2022-08-26 17:54:50 +03:00 |
|
|
|
fc0bcdf4b4
|
Web: Client: added zh-CN translation for security history
|
2022-08-26 19:11:42 +05:00 |
|
|
|
0741b1b3f4
|
Web: Client: added vi translation for security history
|
2022-08-26 19:11:26 +05:00 |
|
|
|
4832ef4b81
|
Web: Client: added uk translation for security history
|
2022-08-26 19:11:11 +05:00 |
|
|
|
23f21496b3
|
Web: Client: added tr translation for security history
|
2022-08-26 19:10:56 +05:00 |
|
|
|
c05e46d5cb
|
Web: Client: added sl translation for security history
|
2022-08-26 19:10:44 +05:00 |
|
|
|
dbe287db85
|
Web: Client: added sk translation for security history
|
2022-08-26 19:10:29 +05:00 |
|
|
|
80e83b0b2b
|
Web: Client: added ru translation for security history
|
2022-08-26 19:10:16 +05:00 |
|
|
|
cf9a0ed9ff
|
Web: Client: added pt-BR translation for security history
|
2022-08-26 19:09:59 +05:00 |
|
|
|
874c5eb274
|
Web: Client: added pl translation for security history
|
2022-08-26 19:09:26 +05:00 |
|
|
|
1909d86e09
|
Web: Client: added nl translation for security history
|
2022-08-26 19:09:09 +05:00 |
|
|
|
13bbc56de9
|
Web: Client: added lv translation for security history
|
2022-08-26 19:08:37 +05:00 |
|
|
|
8d1fb25e58
|
Web: Client: added ja translation for security history
|
2022-08-26 19:08:12 +05:00 |
|
|
|
bac412e123
|
Web: Client: added it translation for security history
|
2022-08-26 19:07:40 +05:00 |
|
|
|
aa25d97fe7
|
Web: Client: added fr translation for security history
|
2022-08-26 19:07:25 +05:00 |
|
|
|
ff1a113b13
|
Web: Client: added fi translation for security history
|
2022-08-26 19:06:47 +05:00 |
|
|
|
d24acfb3a7
|
Web: Client: added es translation for security history
|
2022-08-26 19:06:28 +05:00 |
|
|
|
92d4cba5c1
|
Web: Client: added en translation for security history
|
2022-08-26 19:06:14 +05:00 |
|
|
|
902b5d3aaf
|
Web: Client: added de translation for security history
|
2022-08-26 19:05:14 +05:00 |
|
|
|
783c739af9
|
Web: Client: added cs translation for security history
|
2022-08-26 19:04:54 +05:00 |
|
|
|
c9ab34c1b3
|
Web: Client: added bg translation for security history
|
2022-08-26 19:04:35 +05:00 |
|
|
|
2855fb4ff9
|
Web: Client: added az translation for security history
|
2022-08-26 19:04:05 +05:00 |
|
|
|
ac47004401
|
Web: Fixed translations.
|
2022-08-26 10:25:56 +03:00 |
|
|
|
8998c9ee5b
|
Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup
|
2022-08-26 10:21:08 +03:00 |
|
|
|
084cea375a
|
Web: Fixed translation for module documents.
|
2022-08-26 10:18:54 +03:00 |
|
|
|
63ba97d982
|
Web: Fixed styles.
|
2022-08-26 08:14:44 +03:00 |
|
TimofeyBoyko
|
18cad0911c
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-26 06:56:29 +03:00 |
|
|
|
a8142c3446
|
Client: add translates
|
2022-08-25 19:24:20 +03:00 |
|
|
|
d8ff05f7c6
|
Merge branch 'develop' into feature/docspace-backup
|
2022-08-25 16:34:59 +03:00 |
|
|
|
543c6a222d
|
Client: add translates
|
2022-08-25 13:35:15 +03:00 |
|
|
|
1354b95534
|
Client: delete useless translates
|
2022-08-25 13:00:22 +03:00 |
|
mushka
|
2b936a8879
|
added new roomType translation in russian
|
2022-08-24 19:50:09 +03:00 |
|
