|
|
bfddeae2e2
|
Fixed after merge.
|
2024-06-11 17:17:09 +03:00 |
|
|
|
7ff7a35520
|
Merge branch 'develop' into feature/values-renaming
# Conflicts:
# packages/client/public/locales/ar-SA/JavascriptSdk.json
# packages/client/public/locales/ar-SA/Settings.json
# packages/client/public/locales/az/JavascriptSdk.json
# packages/client/public/locales/az/Settings.json
# packages/client/public/locales/az/Translations.json
# packages/client/public/locales/bg/JavascriptSdk.json
# packages/client/public/locales/bg/Settings.json
# packages/client/public/locales/bg/Translations.json
# packages/client/public/locales/cs/JavascriptSdk.json
# packages/client/public/locales/cs/Settings.json
# packages/client/public/locales/cs/Translations.json
# packages/client/public/locales/de/JavascriptSdk.json
# packages/client/public/locales/de/Settings.json
# packages/client/public/locales/de/Translations.json
# packages/client/public/locales/el-GR/JavascriptSdk.json
# packages/client/public/locales/el-GR/Settings.json
# packages/client/public/locales/el-GR/Translations.json
# packages/client/public/locales/en/JavascriptSdk.json
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/en/Translations.json
# packages/client/public/locales/es/JavascriptSdk.json
# packages/client/public/locales/es/Settings.json
# packages/client/public/locales/es/Translations.json
# packages/client/public/locales/fi/JavascriptSdk.json
# packages/client/public/locales/fi/Settings.json
# packages/client/public/locales/fi/Translations.json
# packages/client/public/locales/fr/JavascriptSdk.json
# packages/client/public/locales/fr/Settings.json
# packages/client/public/locales/fr/Translations.json
# packages/client/public/locales/hy-AM/Settings.json
# packages/client/public/locales/hy-AM/Translations.json
# packages/client/public/locales/it/JavascriptSdk.json
# packages/client/public/locales/it/Settings.json
# packages/client/public/locales/it/Translations.json
# packages/client/public/locales/ja-JP/JavascriptSdk.json
# packages/client/public/locales/ja-JP/Settings.json
# packages/client/public/locales/ja-JP/Translations.json
# packages/client/public/locales/ko-KR/JavascriptSdk.json
# packages/client/public/locales/ko-KR/Settings.json
# packages/client/public/locales/ko-KR/Translations.json
# packages/client/public/locales/lo-LA/Settings.json
# packages/client/public/locales/lo-LA/Translations.json
# packages/client/public/locales/lv/JavascriptSdk.json
# packages/client/public/locales/lv/Settings.json
# packages/client/public/locales/lv/Translations.json
# packages/client/public/locales/nl/JavascriptSdk.json
# packages/client/public/locales/nl/Settings.json
# packages/client/public/locales/nl/Translations.json
# packages/client/public/locales/pl/JavascriptSdk.json
# packages/client/public/locales/pl/Settings.json
# packages/client/public/locales/pl/Translations.json
# packages/client/public/locales/pt-BR/JavascriptSdk.json
# packages/client/public/locales/pt-BR/Settings.json
# packages/client/public/locales/pt-BR/Translations.json
# packages/client/public/locales/pt/JavascriptSdk.json
# packages/client/public/locales/pt/Settings.json
# packages/client/public/locales/pt/Translations.json
# packages/client/public/locales/ro/JavascriptSdk.json
# packages/client/public/locales/ro/Settings.json
# packages/client/public/locales/ro/Translations.json
# packages/client/public/locales/ru/JavascriptSdk.json
# packages/client/public/locales/ru/Settings.json
# packages/client/public/locales/ru/Translations.json
# packages/client/public/locales/si/JavascriptSdk.json
# packages/client/public/locales/si/Settings.json
# packages/client/public/locales/si/Translations.json
# packages/client/public/locales/sk/JavascriptSdk.json
# packages/client/public/locales/sk/Settings.json
# packages/client/public/locales/sk/Translations.json
# packages/client/public/locales/sl/JavascriptSdk.json
# packages/client/public/locales/sl/Settings.json
# packages/client/public/locales/sl/Translations.json
# packages/client/public/locales/sr-Latn-RS/JavascriptSdk.json
# packages/client/public/locales/sr-Latn-RS/Settings.json
# packages/client/public/locales/sr-Latn-RS/Translations.json
# packages/client/public/locales/tr/JavascriptSdk.json
# packages/client/public/locales/tr/Settings.json
# packages/client/public/locales/tr/Translations.json
# packages/client/public/locales/uk-UA/JavascriptSdk.json
# packages/client/public/locales/uk-UA/Settings.json
# packages/client/public/locales/uk-UA/Translations.json
# packages/client/public/locales/vi/JavascriptSdk.json
# packages/client/public/locales/vi/Settings.json
# packages/client/public/locales/vi/Translations.json
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/FilesSelector/utils.ts
# packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
# packages/client/src/components/dialogs/DeletePortalDialog/index.js
# packages/client/src/components/panels/InvitePanel/utils/index.js
# packages/client/src/pages/Confirm/sub-components/changePhone.js
# packages/client/src/pages/Confirm/sub-components/continuePortal.js
# packages/client/src/pages/Confirm/sub-components/deactivatePortal.js
# packages/client/src/pages/Confirm/sub-components/removePortal.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/RowView/userContent.js
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
# packages/client/src/pages/Home/Section/AccountsBody/People/RowView/userContent.js
# packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/index.js
# packages/client/src/pages/PortalSettings/categories/delete-data/index.js
# packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/DocSpace.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Manager.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/sub-components/MainElementParameter.js
# packages/client/src/pages/PortalSettings/categories/payments/SaaS/PaymentContainer.js
# packages/client/src/store/AccountsContextOptionsStore.js
# packages/client/src/store/ContextOptionsStore.js
# packages/client/src/store/PeopleStore.js
# packages/management/public/locales/ar-SA/Management.json
# packages/management/public/locales/az/Management.json
# packages/management/public/locales/bg/Management.json
# packages/management/public/locales/cs/Management.json
# packages/management/public/locales/de/Management.json
# packages/management/public/locales/el-GR/Management.json
# packages/management/public/locales/en/Management.json
# packages/management/public/locales/es/Management.json
# packages/management/public/locales/fi/Management.json
# packages/management/public/locales/fr/Management.json
# packages/management/public/locales/it/Management.json
# packages/management/public/locales/ja-JP/Management.json
# packages/management/public/locales/ko-KR/Management.json
# packages/management/public/locales/lv/Management.json
# packages/management/public/locales/nl/Management.json
# packages/management/public/locales/pl/Management.json
# packages/management/public/locales/pt-BR/Management.json
# packages/management/public/locales/pt/Management.json
# packages/management/public/locales/ro/Management.json
# packages/management/public/locales/ru/Management.json
# packages/management/public/locales/sk/Management.json
# packages/management/public/locales/sl/Management.json
# packages/management/public/locales/sr-Latn-RS/Management.json
# packages/management/public/locales/tr/Management.json
# packages/management/public/locales/uk-UA/Management.json
# packages/management/public/locales/vi/Management.json
# packages/management/src/categories/spaces/sub-components/ConfigurationSection.tsx
# packages/management/src/categories/spaces/sub-components/dialogs/CreatePortalDialog/index.tsx
# packages/shared/utils/common.ts
# public/locales/ar-SA/Common.json
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el-GR/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/hy-AM/Common.json
# public/locales/it/Common.json
# public/locales/ja-JP/Common.json
# public/locales/ko-KR/Common.json
# public/locales/lo-LA/Common.json
# public/locales/lv/Common.json
# public/locales/nl/Common.json
# public/locales/pl/Common.json
# public/locales/pt-BR/Common.json
# public/locales/pt/Common.json
# public/locales/ro/Common.json
# public/locales/ru/Common.json
# public/locales/si/Common.json
# public/locales/sk/Common.json
# public/locales/sl/Common.json
# public/locales/sr-Latn-RS/Common.json
# public/locales/tr/Common.json
# public/locales/uk-UA/Common.json
# public/locales/vi/Common.json
|
2024-06-11 17:15:32 +03:00 |
|
|
|
caacc6e563
|
Merge pull request #476 from ONLYOFFICE/bugfix/fixed-filtering-after-user-deleting
Fix Bug 68439 - Accounts. Fixed sorting of the list after deleting an…
|
2024-06-11 14:51:07 +03:00 |
|
|
|
6b5cb2bdd0
|
Fix Bug 68439 - Accounts. Fixed sorting of the list after deleting an account
|
2024-06-11 14:27:23 +03:00 |
|
|
|
00b54b88e3
|
Merge pull request #471 from ONLYOFFICE/bugfix/fixed-multiple-windows-table
Web: Components: fixed table for multiple windows
|
2024-06-11 14:23:10 +03:00 |
|
|
|
9c4d539508
|
Merge pull request #474 from ONLYOFFICE/bugfix/renaming-constant
Bugfix/renaming constant
|
2024-06-11 15:21:08 +04:00 |
|
|
|
ea18790cbc
|
Replacing a value with a constant.
|
2024-06-11 14:08:50 +03:00 |
|
|
|
06660287c0
|
Merge pull request #472 from ONLYOFFICE/bugfix/fixed-owner-role-label
Fix Bug 68474 - Room: Owner: fixed role label
|
2024-06-11 14:05:47 +03:00 |
|
|
|
6531435d84
|
Merge branch 'develop' into feature/values-renaming
|
2024-06-11 13:53:39 +03:00 |
|
|
|
07050701a8
|
Fixed translations.
|
2024-06-11 13:33:32 +03:00 |
|
|
|
55c9942146
|
Renaming portalName value.
|
2024-06-11 13:28:32 +03:00 |
|
|
|
e29d99c9d2
|
Renaming portalName value.
|
2024-06-11 13:24:00 +03:00 |
|
|
|
a287238d47
|
Renaming PORTAL value.
|
2024-06-11 13:20:10 +03:00 |
|
|
|
f6781914dd
|
Fix Bug 68474 - Room: Owner: fixed role label
|
2024-06-11 12:46:42 +03:00 |
|
|
|
e16ffcda06
|
Added ClientConfig.
|
2024-06-11 11:23:31 +03:00 |
|
|
|
88b8c9b68c
|
Renaming classes.
|
2024-06-11 11:11:46 +03:00 |
|
|
|
7b57fc663a
|
Web: Components: fixed table for multiple windows
|
2024-06-11 11:03:45 +03: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 |
|
|
|
dd0ab01575
|
Deleted useless code.
|
2024-06-10 21:29:28 +03:00 |
|
|
|
1197023bd6
|
Renaming the function to portalSettingsUrl name.
|
2024-06-10 21:27:26 +03:00 |
|
|
|
96ad993625
|
Client: PortalSettings:DeveloperTools: Renaming.
|
2024-06-10 21:25:47 +03:00 |
|
|
|
4ff109dc7f
|
Renaming the function to setTypePortalAdmin name.
|
2024-06-10 21:23:35 +03:00 |
|
|
|
d05b37638f
|
Renaming the component to PortalLogo name.
|
2024-06-10 21:21:38 +03:00 |
|
|
|
0758c55720
|
Added FromPortal key.
|
2024-06-10 20:46:43 +03:00 |
|
|
|
440553c265
|
Added SelectFromPortal key.
|
2024-06-10 20:45:45 +03:00 |
|
|
|
aa6945e473
|
Added SelectToPortal key.
|
2024-06-10 20:43:35 +03:00 |
|
|
|
d27122e99b
|
Added PortalOwner key.
|
2024-06-10 20:42:04 +03:00 |
|
|
|
9cc09bb00f
|
Added PortalAdmin key.
|
2024-06-10 20:40:58 +03:00 |
|
|
|
07d8235d2f
|
Added PortalName key.
|
2024-06-10 20:38:57 +03:00 |
|
|
|
f0cc4f7b6b
|
Added CreatingPortal key.
|
2024-06-10 20:36:55 +03:00 |
|
|
|
fa445716ca
|
Added RolePortalAdminDescription key.
|
2024-06-10 20:34:01 +03:00 |
|
|
|
2558320fb6
|
Added ImportFromPortal key.
|
2024-06-10 20:32:04 +03:00 |
|
|
|
0cc3d401cb
|
Added DeletePortalInfo key.
|
2024-06-10 20:30:00 +03:00 |
|
|
|
97dd1b401b
|
Added DeletePortal key.
|
2024-06-10 20:28:00 +03:00 |
|
|
|
a8813f169e
|
Added PortalDescription key.
|
2024-06-10 20:26:05 +03:00 |
|
|
|
651b3ebe40
|
Added CreateSamplePortal key.
|
2024-06-10 20:24:47 +03: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 |
|
