|
|
a3c74828b8
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/MobileView.js
|
2024-06-10 23:42:36 +04:00 |
|
|
|
a4ba77e0eb
|
Merge pull request #469 from ONLYOFFICE/feature/branding-translation-correction
Feature/branding translation correction
|
2024-06-10 23:39:04 +04:00 |
|
|
|
6ad60b9446
|
Merge branch 'develop' into feature/branding-translation-correction
|
2024-06-10 23:32:26 +04:00 |
|
|
|
e2dfd760be
|
Accounts: Filter: Change filtration status to EmployeeStatus totally (+new pending)
|
2024-06-10 23:23:30 +04:00 |
|
|
|
00358cb90f
|
Fixed translations.
|
2024-06-10 20:20:33 +03:00 |
|
|
|
ee05566b1e
|
Merge branch 'develop' into feature/branding-translation-correction
|
2024-06-10 20:07:07 +03:00 |
|
|
|
40dc2c1c1b
|
Added new constant.
|
2024-06-10 17:14:25 +03:00 |
|
|
|
d5e58a25fa
|
Fixed translation.
|
2024-06-10 16:49:25 +03:00 |
|
|
|
59be0e4375
|
Fixed translation.
|
2024-06-10 16:48:05 +03:00 |
|
|
|
e44172d04b
|
Added interpolation for WebhooksInfo key.
|
2024-06-10 16:39:53 +03:00 |
|
|
|
bf4a25017d
|
Added interpolation for AppName key.
|
2024-06-10 16:36:22 +03:00 |
|
|
|
74c6c74835
|
Added interpolation for SpMetadataDescription key.
|
2024-06-10 16:32:21 +03:00 |
|
|
|
1989992426
|
Added interpolation for SpMetadata key.
|
2024-06-10 16:30:03 +03:00 |
|
|
|
d78ebf4954
|
Added interpolation for ServiceProviderSettings key.
|
2024-06-10 16:27:10 +03:00 |
|
|
|
aff11fa273
|
Added interpolation for SelectUsersDescriptionWorkspace key.
|
2024-06-10 16:16:15 +03:00 |
|
|
|
f1744c05be
|
Added interpolation for SelectUsersDescriptionNextcloud key.
|
2024-06-10 16:13:09 +03:00 |
|
|
|
42000c4690
|
Added interpolation for SelectUsersDescriptionGoogle key.
|
2024-06-10 16:10:38 +03:00 |
|
|
|
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 |
|
|
|
3f1f83b353
|
Added interpolation for ImportCompleteDescriptionWorkspace key.
|
2024-06-10 15:41:55 +03: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 |
|
|
|
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 |
|
|
|
1eb54ab218
|
Fixed translations.
|
2024-06-08 22:01:35 +03:00 |
|
|
|
7d2601ac24
|
Accounts: Block opportunity to disable LDAP users
|
2024-06-07 16:52:16 +04:00 |
|
