|
|
1788aacf93
|
Merge branch 'develop' into feature/VDR-indexing
# Conflicts:
# packages/client/public/locales/en/CreateEditRoomDialog.json
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/shared/api/files/index.ts
# packages/shared/components/table/TableHeader.tsx
# packages/shared/enums/index.ts
# packages/shared/themes/dark.ts
# public/locales/en/Common.json
|
2024-06-24 14:12:56 +05:00 |
|
|
|
35ef0b8832
|
images: notifications: new icon
|
2024-06-22 15:08:03 +03:00 |
|
|
|
8c976678d2
|
Merge branch 'develop' into feature/embedding-settings
|
2024-06-21 11:38:29 +04:00 |
|
|
|
51bb9ccbfe
|
Translations: Fix EmptyValueKeysTest issues
|
2024-06-20 16:51:42 +04:00 |
|
|
|
056cad63a4
|
Merge branch 'develop' into feature/embedding-settings
|
2024-06-20 15:41:14 +03:00 |
|
|
|
b5ae010c29
|
Translations: Fix WrongTranslationVariablesTest issues
|
2024-06-20 16:27:14 +04:00 |
|
|
|
13cc8c1ad5
|
Translations: Fix UselessTranslationKeysTest
|
2024-06-20 15:29:24 +04:00 |
|
|
|
8283ed16e6
|
Merge branch 'develop' into feature/sr-cyrl
|
2024-06-20 12:46:42 +04:00 |
|
Akmal Isomadinov
|
99cd9ad8cc
|
Merge branch 'develop' into bugfix/form-room
|
2024-06-19 15:59:19 +05:00 |
|
Akmal Isomadinov
|
4d48d3563e
|
Public:Locales Fixed translation
|
2024-06-19 14:47:38 +05:00 |
|
Akmal Isomadinov
|
a9f38e7586
|
Client:Home:InfoPanel Added anonymous
|
2024-06-19 14:45:57 +05:00 |
|
|
|
8a001cf415
|
Added new images for notifications
|
2024-06-18 18:25:18 +03:00 |
|
Akmal Isomadinov
|
1b99bc534f
|
Merge branch 'develop' into bugfix/form-room
|
2024-06-18 14:44:51 +05:00 |
|
|
|
a74bcac2f1
|
edited variables sr-cyrl
|
2024-06-18 11:28:09 +03:00 |
|
Akmal Isomadinov
|
181f412e8c
|
Doceditor: Fixed share PDF form
|
2024-06-18 12:02:21 +05:00 |
|
Akmal Isomadinov
|
67f9c3097e
|
Public:Locales Fixed context menu
|
2024-06-17 16:43:04 +05: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 |
|
|
|
834513ecd3
|
Client: Added common flag for "sr-Cyrl-RS"
|
2024-06-17 14:55:55 +04:00 |
|
Akmal Isomadinov
|
90f103b5cf
|
Public:Locales Fixed description form room
|
2024-06-17 14:28:22 +05:00 |
|
|
|
918cd0db9c
|
Merge branch 'develop' into feature/embedding-settings
# Conflicts:
# packages/client/src/components/panels/EditLinkPanel/index.js
# packages/shared/themes/base.ts
# packages/shared/themes/dark.ts
|
2024-06-14 15:48:00 +03:00 |
|
|
|
f60ef3547d
|
Renaming.
|
2024-06-14 13:19:28 +03:00 |
|
|
|
1fcd54c654
|
Fixed translation.
|
2024-06-14 12:35:42 +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 |
|
|
|
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 |
|
|
|
c88c4b84bf
|
Fixed after merge.
|
2024-06-13 12:11:08 +03: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 |
|
|
|
0758c55720
|
Added FromPortal key.
|
2024-06-10 20:46:43 +03:00 |
|
|
|
440553c265
|
Added SelectFromPortal key.
|
2024-06-10 20:45:45 +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 |
|
|
|
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 |
|
|
|
86f4555c1b
|
Client: fixed VDR Room description after merge
|
2024-06-10 16:11:48 +05:00 |
|
|
|
d15445301c
|
Merge branch 'develop' into feature/VDR-indexing
# Conflicts:
# packages/client/public/locales/en/CreateEditRoomDialog.json
# packages/client/public/locales/en/Files.json
# packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js
# packages/client/src/helpers/filesUtils.js
# packages/client/src/store/CreateEditRoomStore.js
# public/locales/en/Common.json
|
2024-06-10 16:05:56 +05:00 |
|
Akmal Isomadinov
|
71cd1ec9ea
|
Public:locales transfers moved to a common
|
2024-06-10 15:42:14 +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 |
|
Akmal Isomadinov
|
ad43e12216
|
Web:Public:Locales: Added translations
|
2024-06-10 11:21:11 +05:00 |
|
|
|
1eb54ab218
|
Fixed translations.
|
2024-06-08 22:01:35 +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 |
|
|
|
03d313606f
|
Deleted zh-CN translations.
|
2024-06-07 15:26:45 +03:00 |
|
|
|
5d741e793b
|
LDAP: Fix last status of operation completed
|
2024-06-07 15:48:54 +04:00 |
|
