|
|
8283ed16e6
|
Merge branch 'develop' into feature/sr-cyrl
|
2024-06-20 12:46:42 +04:00 |
|
|
|
a74bcac2f1
|
edited variables sr-cyrl
|
2024-06-18 11:28:09 +03:00 |
|
|
|
a639635c98
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
# packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
# packages/login/src/components/LoginForm/index.tsx
# packages/shared/store/SettingsStore.ts
# public/locales/en/Common.json
|
2024-06-17 15:17:07 +04:00 |
|
|
|
5593c4b655
|
Merge branch 'develop' into feature/values-renaming
|
2024-06-14 11:27:02 +04:00 |
|
|
|
a72616801b
|
gs
# Conflicts:
# i18next/client.babel
# packages/client/public/locales/sr-Latn-RS/SMTPSettings.json
# packages/login/public/locales/en/Login.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/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 19:24:05 +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 |
|
|
|
cb0fd44eb3
|
Merge branch 'develop' into bugfix/standalone
|
2024-06-11 20:32:48 +04:00 |
|
|
|
c8a04cce7b
|
Added new translation.
|
2024-06-11 18:34:47 +03:00 |
|
Akmal Isomadinov
|
fb940c9add
|
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-11 20:15:15 +05:00 |
|
|
|
bfddeae2e2
|
Fixed after merge.
|
2024-06-11 17:17:09 +03:00 |
|
|
|
55c9942146
|
Renaming portalName value.
|
2024-06-11 13:28:32 +03:00 |
|
|
|
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 |
|
|
|
d27122e99b
|
Added PortalOwner key.
|
2024-06-10 20:42:04 +03:00 |
|
|
|
9cc09bb00f
|
Added PortalAdmin key.
|
2024-06-10 20:40:58 +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
|
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 |
|
Akmal Isomadinov
|
71cd1ec9ea
|
Public:locales transfers moved to a common
|
2024-06-10 15:42:14 +05:00 |
|
|
|
5260b39b40
|
Changed Common translation.
|
2024-06-10 12:51:40 +03:00 |
|
|
|
c8df2d9703
|
Merge branch 'develop' into feature/branding-correction
# Conflicts:
# packages/client/public/locales/ar-SA/CreateEditRoomDialog.json
# packages/client/public/locales/az/CreateEditRoomDialog.json
# packages/client/public/locales/bg/CreateEditRoomDialog.json
# packages/client/public/locales/cs/CreateEditRoomDialog.json
# packages/client/public/locales/de/CreateEditRoomDialog.json
# packages/client/public/locales/el-GR/CreateEditRoomDialog.json
# packages/client/public/locales/en/CreateEditRoomDialog.json
# packages/client/public/locales/es/CreateEditRoomDialog.json
# packages/client/public/locales/fi/CreateEditRoomDialog.json
# packages/client/public/locales/fr/CreateEditRoomDialog.json
# packages/client/public/locales/hy-AM/CreateEditRoomDialog.json
# packages/client/public/locales/it/CreateEditRoomDialog.json
# packages/client/public/locales/ja-JP/CreateEditRoomDialog.json
# packages/client/public/locales/ko-KR/CreateEditRoomDialog.json
# packages/client/public/locales/lo-LA/CreateEditRoomDialog.json
# packages/client/public/locales/lv/CreateEditRoomDialog.json
# packages/client/public/locales/nl/CreateEditRoomDialog.json
# packages/client/public/locales/pl/CreateEditRoomDialog.json
# packages/client/public/locales/pt-BR/CreateEditRoomDialog.json
# packages/client/public/locales/pt/CreateEditRoomDialog.json
# packages/client/public/locales/ro/CreateEditRoomDialog.json
# packages/client/public/locales/ru/CreateEditRoomDialog.json
# packages/client/public/locales/si/CreateEditRoomDialog.json
# packages/client/public/locales/sk/CreateEditRoomDialog.json
# packages/client/public/locales/sl/CreateEditRoomDialog.json
# packages/client/public/locales/sr-Latn-RS/CreateEditRoomDialog.json
# packages/client/public/locales/tr/CreateEditRoomDialog.json
# packages/client/public/locales/uk-UA/CreateEditRoomDialog.json
# packages/client/public/locales/vi/CreateEditRoomDialog.json
# packages/client/public/locales/zh-CN/CreateEditRoomDialog.json
|
2024-06-07 15:49:36 +03:00 |
|
|
|
5d741e793b
|
LDAP: Fix last status of operation completed
|
2024-06-07 15:48:54 +04:00 |
|
|
|
91d034a385
|
Merge branch 'develop' into feature/ldap-settings
|
2024-06-07 12:05:06 +04:00 |
|
|
|
ce9da8e898
|
Client: move translation key to 'Common'
|
2024-06-05 11:13:23 +03:00 |
|
|
|
a81baf7e74
|
added sr-cyrl
|
2024-06-04 15:29:57 +03:00 |
|
|
|
c58d44e55e
|
Move some translation keys to Common.json
|
2024-06-03 19:22:44 +03:00 |
|
|
|
c02cc44108
|
Added interpolation for 'PortalRestriction' key.
|
2024-05-30 14:48:46 +03:00 |
|
|
|
53529ce19a
|
Added interpolation for 'EmptyDescription' key.
|
2024-05-30 14:04:56 +03:00 |
|
|
|
8c7bd1a241
|
Added interpolation for 'DocspaceOwner' key.
|
2024-05-30 13:27:15 +03:00 |
|
|
|
c0ee32f303
|
Added interpolation for 'DocspaceAdmin' key.
|
2024-05-30 13:13:43 +03:00 |
|
|
|
99f1b8375e
|
i18next: apply sorting of keys
|
2024-05-29 13:39:15 +04:00 |
|
|
|
12d8e073c2
|
Translations: Moved Authentication key to Common
|
2024-05-29 12:49:21 +04:00 |
|
|
|
da064a698f
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-27 16:23:36 +04:00 |
|
|
|
d1061bb3ae
|
renaming resource keys
|
2024-05-23 18:14:33 +03:00 |
|
|
|
1f169880e8
|
LDAP: Added badge LDAP
|
2024-05-21 10:34:59 +04:00 |
|
|
|
881b7bad4b
|
Translations: fix UselessTranslationKeysTest issues
|
2024-05-15 19:37:37 +04:00 |
|
|
|
b52e7af32c
|
Fix Bug 67813
No translation of Share panel in editor
|
2024-05-03 12:32:58 +03:00 |
|
|
|
fede13cd74
|
Translations: Moved "Errors:InvalidLink" to Common
|
2024-04-26 17:41:30 +04:00 |
|
|
|
af7ea9116e
|
Translations: Moved 'Reconnect' key to Common
|
2024-04-19 14:54:40 +04:00 |
|
|
|
49cb4789f9
|
Enabled new language sr-Latn-RS
|
2024-04-16 13:02:44 +04:00 |
|
|
|
b5a38f3434
|
Translations: Fix UselessTranslationKeysTest issues
|
2024-04-11 12:46:19 +04:00 |
|
|
|
64c2989408
|
edited translations
|
2024-04-10 18:28:56 +03:00 |
|
|
|
daf914604e
|
Translation: Moved "InviteDialog:Invited" and "Settings:Disabled" keys to Common
|
2024-03-26 13:51:15 +04:00 |
|
|
|
7293ae5dbd
|
Fix some translation issues
|
2024-03-07 20:07:06 +04:00 |
|
|
|
18fd7db7a5
|
Fix UselessTranslationKeysTest issues
|
2024-03-07 18:10:01 +04:00 |
|
|
|
39ae48c524
|
Fix FullEnDublicatesTest issues
|
2024-03-06 01:59:38 +04:00 |
|
|
|
1c6046dd04
|
Fix EnDublicatesByContentTest issue
|
2024-03-05 22:45:06 +04:00 |
|
|
|
f2db2406fa
|
Merge branch 'bugfix/rc-2.5.0' into feature/si
# Conflicts:
# i18next/client.babel
# i18next/common.babel
# i18next/editor.babel
|
2024-03-05 13:44:26 +04:00 |
|
|
|
bfd1a04638
|
Fix empty SSO label issue
|
2024-03-04 15:05:39 +03:00 |
|
|
|
828e159767
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-03-01 11:52:08 +04:00 |
|
|
|
55d54d63b2
|
updated it, hy
|
2024-02-29 15:22:55 +03:00 |
|
