Commit Graph

315 Commits

Author SHA1 Message Date
a74bcac2f1 edited variables sr-cyrl 2024-06-18 11:28:09 +03:00
e247ba3db3 Renaming. 2024-06-14 13:07:19 +03:00
6101c7ad60 Fixed after merge. 2024-06-14 11:03:07 +03:00
5593c4b655 Merge branch 'develop' into feature/values-renaming 2024-06-14 11:27:02 +04:00
0730775b36 Merge branch 'feature/sr-cyrl' into develop
# Conflicts:
#	packages/client/public/locales/en/PrivacyPage.json
#	packages/client/public/locales/sr-Latn-RS/ChangeUserStatusDialog.json
#	packages/client/public/locales/sr-Latn-RS/CreateEditRoomDialog.json
#	packages/client/public/locales/sr-Latn-RS/Files.json
#	packages/client/public/locales/sr-Latn-RS/JavascriptSdk.json
#	packages/client/public/locales/sr-Latn-RS/Notifications.json
#	packages/client/public/locales/sr-Latn-RS/PaymentsEnterprise.json
#	packages/client/public/locales/sr-Latn-RS/PrivacyPage.json
#	packages/client/public/locales/sr-Latn-RS/Settings.json
#	packages/client/public/locales/sr-Latn-RS/SingleSignOn.json
#	packages/client/public/locales/sr-Latn-RS/Webhooks.json
#	public/locales/sr-Latn-RS/Common.json
2024-06-13 14:23:08 +04:00
3fb8f58206 Merge branch 'develop' into feature/values-renaming
# Conflicts:
#	packages/client/src/components/Article/MainButton/index.js
#	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
#	public/locales/zh-CN/Common.json
2024-06-13 11:28:33 +03:00
d1a1c9b477 Merge branch 'develop' into bugfix/standalone
# Conflicts:
#	packages/client/public/locales/ar-SA/PaymentsEnterprise.json
#	packages/client/public/locales/az/PaymentsEnterprise.json
#	packages/client/public/locales/bg/PaymentsEnterprise.json
#	packages/client/public/locales/cs/PaymentsEnterprise.json
#	packages/client/public/locales/de/PaymentsEnterprise.json
#	packages/client/public/locales/el-GR/PaymentsEnterprise.json
#	packages/client/public/locales/en/PaymentsEnterprise.json
#	packages/client/public/locales/es/PaymentsEnterprise.json
#	packages/client/public/locales/fi/PaymentsEnterprise.json
#	packages/client/public/locales/fr/PaymentsEnterprise.json
#	packages/client/public/locales/hy-AM/PaymentsEnterprise.json
#	packages/client/public/locales/it/PaymentsEnterprise.json
#	packages/client/public/locales/ja-JP/PaymentsEnterprise.json
#	packages/client/public/locales/ko-KR/PaymentsEnterprise.json
#	packages/client/public/locales/lo-LA/PaymentsEnterprise.json
#	packages/client/public/locales/lv/PaymentsEnterprise.json
#	packages/client/public/locales/nl/PaymentsEnterprise.json
#	packages/client/public/locales/pl/PaymentsEnterprise.json
#	packages/client/public/locales/pt-BR/PaymentsEnterprise.json
#	packages/client/public/locales/pt/PaymentsEnterprise.json
#	packages/client/public/locales/ro/PaymentsEnterprise.json
#	packages/client/public/locales/ru/PaymentsEnterprise.json
#	packages/client/public/locales/si/PaymentsEnterprise.json
#	packages/client/public/locales/sk/PaymentsEnterprise.json
#	packages/client/public/locales/sl/PaymentsEnterprise.json
#	packages/client/public/locales/sr-Latn-RS/PaymentsEnterprise.json
#	packages/client/public/locales/tr/PaymentsEnterprise.json
#	packages/client/public/locales/uk-UA/PaymentsEnterprise.json
#	packages/client/public/locales/vi/PaymentsEnterprise.json
2024-06-11 18:27:24 +03:00
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
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
e16ffcda06 Added ClientConfig. 2024-06-11 11:23:31 +03:00
88b8c9b68c Renaming classes. 2024-06-11 11:11:46 +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
03d313606f Deleted zh-CN translations. 2024-06-07 15:26:45 +03:00
6c83c3a044 Added Bonus page for Spaces. Added page redirection. 2024-06-06 16:37:00 +03:00
a81baf7e74 added sr-cyrl 2024-06-04 15:29:57 +03:00
f794931693 Fixed translation. 2024-06-03 19:04:03 +03:00
2338282d28 Fixed translation. 2024-05-31 09:24:24 +03:00
5025ac04a1 Added interpolation for 'DeletePortalText' key. 2024-05-31 09:22:21 +03:00
669ccb8300 Added interpolation for 'CreateSpaceDescription' key. 2024-05-31 09:16:00 +03:00
a0e97e157d Added interpolation for 'CreatingDocspace' key. 2024-05-31 09:11:59 +03:00
abfeb4c05c Added interpolation for 'DocspaceName' key. 2024-05-31 09:07:10 +03:00
de895240dd Added interpolation for 'ConfigurationDescription' key. 2024-05-30 17:54:20 +03:00
0ca78803ab added sr-Cyrl 2024-05-29 15:18:22 +03:00
410f69e130 Merge branch 'develop' into feature/editor-in-same-tab 2024-05-27 16:31:42 +04:00
d1061bb3ae renaming resource keys 2024-05-23 18:14:33 +03:00
db58a3fee9 Web: delete openOnNewPage from config 2024-05-21 13:09:17 +03:00
446acde907 Add new script start:internal and start-prod:internal 2024-05-15 12:28:31 +03:00
adfc7a6457 Web: Management: Backup. fixed crash 2024-04-22 16:11:03 +05:00
d3bfdba97e Fix Bug 67579 - Srv: Spaces. The Backup section displays a back button. 2024-04-22 16:04:34 +05:00
e21d411b03 Bump version to v2.5.1 2024-04-22 13:14:32 +04:00
371b9b018e Management: Add using system font in management 2024-04-18 12:48:03 +02:00
823a7a03e0 Management: add currentColorScheme for article 2024-04-15 14:11:39 +03:00
0c3d80dbe8 Fix Bug 67386
Favicon is not displayed in Safari
2024-04-15 07:18:25 +03:00
ca6f559816 Merge branch 'release/v2.5.0' into feature/new-translations_v.2.5 2024-04-12 18:27:27 +04:00
0ee71165ac added sr-latn-RS 2024-04-11 19:48:03 +03:00
76191f0463 Management: add hash for config and browser detector 2024-04-11 17:06:43 +03:00
64c2989408 edited translations 2024-04-10 18:28:56 +03:00
e298fc0d1d Merge branch 'release/v2.5.0' into feature/new-translations_v.2.5
# Conflicts:
#	packages/client/public/locales/ar-SA/InviteDialog.json
#	packages/client/public/locales/ar-SA/Settings.json
#	packages/client/public/locales/az/InviteDialog.json
#	packages/client/public/locales/az/Settings.json
#	packages/client/public/locales/bg/InviteDialog.json
#	packages/client/public/locales/bg/Settings.json
#	packages/client/public/locales/cs/InviteDialog.json
#	packages/client/public/locales/cs/Settings.json
#	packages/client/public/locales/de/InviteDialog.json
#	packages/client/public/locales/de/Settings.json
#	packages/client/public/locales/el-GR/InviteDialog.json
#	packages/client/public/locales/el-GR/Settings.json
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/en/WebPlugins.json
#	packages/client/public/locales/es/InviteDialog.json
#	packages/client/public/locales/es/Settings.json
#	packages/client/public/locales/fi/InviteDialog.json
#	packages/client/public/locales/fi/Settings.json
#	packages/client/public/locales/fr/InviteDialog.json
#	packages/client/public/locales/fr/Settings.json
#	packages/client/public/locales/hy-AM/InviteDialog.json
#	packages/client/public/locales/hy-AM/Settings.json
#	packages/client/public/locales/it/InviteDialog.json
#	packages/client/public/locales/it/Settings.json
#	packages/client/public/locales/ja-JP/InviteDialog.json
#	packages/client/public/locales/ja-JP/Settings.json
#	packages/client/public/locales/ko-KR/InviteDialog.json
#	packages/client/public/locales/ko-KR/Settings.json
#	packages/client/public/locales/lv/InviteDialog.json
#	packages/client/public/locales/lv/Settings.json
#	packages/client/public/locales/nl/InviteDialog.json
#	packages/client/public/locales/nl/Settings.json
#	packages/client/public/locales/pl/InviteDialog.json
#	packages/client/public/locales/pl/Settings.json
#	packages/client/public/locales/pt-BR/InviteDialog.json
#	packages/client/public/locales/pt-BR/Settings.json
#	packages/client/public/locales/pt/InviteDialog.json
#	packages/client/public/locales/pt/Settings.json
#	packages/client/public/locales/ro/InviteDialog.json
#	packages/client/public/locales/ro/Settings.json
#	packages/client/public/locales/ru/InviteDialog.json
#	packages/client/public/locales/ru/Settings.json
#	packages/client/public/locales/ru/Translations.json
#	packages/client/public/locales/sk/InviteDialog.json
#	packages/client/public/locales/sk/Settings.json
#	packages/client/public/locales/sl/InviteDialog.json
#	packages/client/public/locales/sl/Settings.json
#	packages/client/public/locales/tr/InviteDialog.json
#	packages/client/public/locales/tr/Settings.json
#	packages/client/public/locales/uk-UA/InviteDialog.json
#	packages/client/public/locales/uk-UA/Settings.json
#	packages/client/public/locales/vi/InviteDialog.json
#	packages/client/public/locales/vi/Settings.json
#	packages/client/public/locales/zh-CN/InviteDialog.json
#	packages/client/public/locales/zh-CN/Settings.json
#	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/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/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/sk/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk-UA/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
2024-04-10 18:28:12 +04:00
07d20cd9da added translations 2024-04-10 15:30:25 +03:00
7bb8ee3295 added it 2024-04-09 18:04:38 +03:00
010f63e5d2 added translations 2024-04-04 18:26:42 +03:00
37cf886a61 Web: Removed whiteLabelLogoUrls from injected props 2024-04-04 16:46:43 +03:00
b8ddf6bd9d added translations 2024-04-02 18:24:47 +03:00
ca605f3d17 Merge branch 'release/v2.5.0' into feature/logo-handler 2024-04-02 11:56:47 +04:00
6e144a0291 Management: add back arrow from category 2024-04-02 10:31:28 +03:00
fcd18f0742 Client: Logo from handler 2024-04-02 08:25:21 +03:00