Commit Graph

46603 Commits

Author SHA1 Message Date
dd69f1baa5 Added interpolation for SelectFileDescriptionWorkspace key. 2024-06-10 16:07:43 +03:00
301fd001ac Added interpolation for IntegrationRequest key. 2024-06-10 16:05:23 +03:00
94f2ccdabd Added interpolation for ImportFromOnlyoffice key. 2024-06-10 16:02:46 +03:00
c544c8622a Merge branch 'develop' into feature/ldap-settings
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/MobileView.js
#	packages/login/public/locales/en/Login.json
2024-06-10 16:56:09 +04:00
Akmal Isomadinov
3f4e55e855 Client:EmptyViewContainer: Fixed translation 2024-06-10 17:42:58 +05:00
3f1f83b353 Added interpolation for ImportCompleteDescriptionWorkspace key. 2024-06-10 15:41:55 +03:00
Akmal Isomadinov
58dbc2f406 Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/client/public/locales/en/EmptyView.json
#	packages/client/src/components/Article/MainButton/index.js
#	packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
2024-06-10 17:40:22 +05:00
4605ac2213 Added interpolation for ImportCompleteDescriptionNextcloud key. 2024-06-10 15:38:37 +03:00
adbca34d5e Added interpolation for ImportCompleteDescriptionGoogle key. 2024-06-10 15:35:02 +03:00
78ecc579d3 Added interpolation for DataImportDescription key. 2024-06-10 15:31:42 +03:00
f2c91f49e0 Added interpolation for ApiPageDescription key. 2024-06-10 15:26:51 +03:00
0ee8c7e74c Added interpolation for AddEmailsDescription key. 2024-06-10 15:23:42 +03:00
98a386e35a Added interpolation for AboutDataImport key. 2024-06-10 15:19:39 +03:00
7103a99c73 Added interpolation for PrivacyEditors key. 2024-06-10 15:14:33 +03:00
cfdd662ba7 Added interpolation for PrivacyDescriptionEditors key. 2024-06-10 15:12:20 +03:00
35116ff3d7 Added interpolation for PrivacyClick key. 2024-06-10 15:10:17 +03:00
6ddfa823da Added interpolation for PrivacyButton key. 2024-06-10 15:07:20 +03:00
bfaee1b571 Added interpolation for UpgradeToProBannerInstructionHeader key. 2024-06-10 15:01:12 +03:00
164fefb283 Added interpolation for AllTypesSupportedByEditor key. 2024-06-10 14:58:36 +03:00
5488fc9594 Added interpolation for AllTypesAvailableForEditing key. 2024-06-10 14:56:47 +03:00
d3a640877d Added interpolation for OpenSameTab key. 2024-06-10 14:55:00 +03:00
775a7be56d Added interpolation for ActivateTariffDescr key. 2024-06-10 14:51:34 +03:00
fc71aa476d Added interpolation for PrivateRoomHeader key. 2024-06-10 14:48:38 +03:00
b789129fbf Added value for interpolation. 2024-06-10 14:42:59 +03:00
2a00dde502
Merge pull request #468 from ONLYOFFICE/feature/branding-correction
Feature/branding correction
2024-06-10 14:50:46 +04:00
Akmal Isomadinov
5138708595 Doceditor:Components:ConflictResolveDialog Fixed name space 2024-06-10 15:42:51 +05:00
Akmal Isomadinov
71cd1ec9ea Public:locales transfers moved to a common 2024-06-10 15:42:14 +05:00
ee436b6096 Client: Locales: Confirm: Added line brake inside DeleteProfileSuccessMessageInfo key 2024-06-10 13:20:34 +03:00
f2f5cb5df9 Client: Confirm: ProfileRemove Added line brake for translation template 2024-06-10 13:19:37 +03:00
Akmal Isomadinov
b497daabab Doceditor:Hooks Added useStartFillingSelectDialog 2024-06-10 15:08:26 +05:00
Akmal Isomadinov
6f29496a91 Client:Store:UploadDataStore Refactoring 2024-06-10 15:08:00 +05:00
a566a23b0b Fixed translations. 2024-06-10 12:57:55 +03:00
5260b39b40 Changed Common translation. 2024-06-10 12:51:40 +03:00
2342926313 Translations: Tests: restore fix 2024-06-10 13:22:31 +04:00
b64afa226c Added new tests. 2024-06-10 12:01:47 +03:00
9e07fcf3ce Fixed translation. 2024-06-10 11:13:16 +03:00
78626c0d32 Merge branch 'feature/branding-correction' of https://github.com/ONLYOFFICE/DocSpace-client into feature/branding-correction 2024-06-10 11:09:59 +03:00
6bf6e287a6 Fixed translations. 2024-06-10 11:07:57 +03:00
7603d4772f Translations: Tests: Fix incorrect compare if equal keys from different files (WrongTranslationVariablesTest issue) 2024-06-10 12:07:32 +04:00
2293f900ad Shared:Components:Tabs: change component styles 2024-06-10 14:26:43 +07:00
eeed521785 Shared:Components:Tabs: change prop selectedItemId 2024-06-10 14:25:17 +07:00
ef5e4ee931 Shared:Components:Tabs: add tests 2024-06-10 14:21:57 +07:00
Akmal Isomadinov
87ebdad648 Doceditor:Components Added ConflictResolveDialog 2024-06-10 11:38:31 +05:00
Akmal Isomadinov
41b08a7b19 Doceditor:Components Added StartFillingSelectDialog 2024-06-10 11:38:02 +05:00
Akmal Isomadinov
5a4c10bc2a Doceditor:Hooks:useEditorEvents Removed onRequestStartFilling event 2024-06-10 11:33:44 +05:00
Akmal Isomadinov
d4d350c8af Shared:Selectors:Files:Hooks:UseRoomsHelper Added filter by type 2024-06-10 11:22:57 +05:00
Akmal Isomadinov
ad43e12216 Web:Public:Locales: Added translations 2024-06-10 11:21:11 +05:00
036210d8f9 Shared:Components:Tabs: change prop selectedItem 2024-06-09 21:41:33 +07:00
b50c98311a Shared:Components:Tabs: add documentation 2024-06-09 21:40:10 +07:00
1eb54ab218 Fixed translations. 2024-06-08 22:01:35 +03:00