|
fcc50d6dfc
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-04-26 18:05:43 +04:00 |
|
|
fede13cd74
|
Translations: Moved "Errors:InvalidLink" to Common
|
2024-04-26 17:41:30 +04:00 |
|
Akmal Isomadinov
|
41e70017a0
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/shared/components/empty-view/EmptyView.styled.ts
|
2024-04-22 19:22:51 +05:00 |
|
|
d2733829e5
|
Merge branch 'release/v2.5.0' into develop
|
2024-04-19 19:10:43 +04:00 |
|
Akmal Isomadinov
|
0623e57d9e
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/doceditor/src/utils/index.ts
|
2024-04-19 16:42:10 +05:00 |
|
|
af7ea9116e
|
Translations: Moved 'Reconnect' key to Common
|
2024-04-19 14:54:40 +04:00 |
|
|
8a202e1d79
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/shared/utils/common.ts
|
2024-04-19 13:13:00 +04:00 |
|
Akmal Isomadinov
|
4027d69236
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/doceditor/src/utils/actions.ts
# public/locales/en/Common.json
|
2024-04-18 12:23:54 +05:00 |
|
Akmal Isomadinov
|
6f7ae7540f
|
Client:ContextOptionsStore Added edit pdf action
|
2024-04-16 14:56:12 +05:00 |
|
|
49cb4789f9
|
Enabled new language sr-Latn-RS
|
2024-04-16 13:02:44 +04:00 |
|
|
ddb9f74d83
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/public/locales/en/CreateEditRoomDialog.json
# packages/doceditor/src/app/(root)/create/page.tsx
# public/locales/en/Common.json
|
2024-04-12 19:14:59 +04:00 |
|
Akmal Isomadinov
|
7c4adde668
|
Merge branch 'develop' into feature/form-room
|
2024-04-12 11:36:53 +05:00 |
|
|
7b44084797
|
Translations: Fix EnDublicatesByContentTest issue (Moved "Editor" key to Common and replaced "RoleEditor")
|
2024-04-11 13:34:53 +04:00 |
|
|
5b67fbeb5d
|
Translations: Fix EnDublicatesByContentTest issue (ProviderSso replaced to SSO)
|
2024-04-11 13:10:18 +04:00 |
|
|
0decfee5f0
|
Translations: Fix EnDublicatesByContentTest issue (replaced GroupsNotFoundHeader to NotFoundGroups)
|
2024-04-11 12:51:03 +04:00 |
|
|
b5a38f3434
|
Translations: Fix UselessTranslationKeysTest issues
|
2024-04-11 12:46:19 +04:00 |
|
|
7206ee6205
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/store/DialogsStore.js
|
2024-04-10 20:09:16 +04: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 |
|
Akmal Isomadinov
|
89d79ea51f
|
Client:Dialogs:CreatedPDFFormDialog Update translations
|
2024-04-09 18:50:21 +05:00 |
|
Akmal Isomadinov
|
de5b57ce2e
|
Client:MainButton:Actions Removed FromReadyTemplate
|
2024-04-09 14:38:47 +05:00 |
|
|
013fd4a8be
|
Web: move translations to Common
|
2024-04-09 10:35:07 +03:00 |
|
|
76c29e1335
|
Merge branch 'develop' into feature/form-room-modals
|
2024-04-08 01:39:14 +04:00 |
|
|
820da7bb80
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/FilesSelector/index.tsx
# packages/client/src/components/FilesSelector/utils.ts
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/store/SelectedFolderStore.ts
# packages/doceditor/src/app/create/page.tsx
|
2024-04-04 11:15:24 +04:00 |
|
|
7790adb782
|
Web: Files: ThirdParty: fixed translations
|
2024-04-01 17:42:39 +03:00 |
|
Akmal Isomadinov
|
b2d73e8f48
|
Client:Public:Locales:CreatedPDFFormDialog Added translations
|
2024-03-28 22:53:15 +05:00 |
|
Akmal Isomadinov
|
22002269ab
|
Client:Dialog: Added CreatedPDFFormDialog
|
2024-03-28 17:04:16 +05:00 |
|
|
09bdc7e382
|
Merge branch 'release/v2.5.0' into develop
|
2024-03-26 14:38:57 +04:00 |
|
|
daf914604e
|
Translation: Moved "InviteDialog:Invited" and "Settings:Disabled" keys to Common
|
2024-03-26 13:51:15 +04:00 |
|
|
2d11fbf5bb
|
edited en
|
2024-03-19 12:46:56 +03:00 |
|
|
a9380b879e
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/components/GlobalEvents/CreateEvent.js
# public/locales/en/Common.json
|
2024-03-14 17:47:38 +04:00 |
|
Akmal Isomadinov
|
fe1ace1795
|
Merge branch 'develop' into feature/redesign-form-filling-room
# Conflicts:
# public/locales/en/Common.json
|
2024-03-13 16:38:57 +05:00 |
|
Akmal Isomadinov
|
5fad4f34b8
|
Client:Article:MainButton: Added form file selection actions
|
2024-03-13 15:24:41 +05: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 |
|
Akmal Isomadinov
|
eb9b4f5c6c
|
Client:Article:MainButton Added translations
|
2024-03-07 15:20:02 +05:00 |
|
|
1c2d96145a
|
Added lost translation keys
|
2024-03-07 12:05:03 +04:00 |
|
|
66bc51ea9f
|
Web: Client: fixed translates
|
2024-03-06 20:40:26 +05:00 |
|
|
eb28b234ff
|
Merge branch 'develop' into feature/data-migration
|
2024-03-06 12:55:29 +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 |
|
|
176d1c7f16
|
Merge branch 'develop' into feature/data-migration
|
2024-03-05 22:09:00 +04:00 |
|
|
82f32d8b0b
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/client/src/routes/portalSettings.js
# packages/client/src/store/DialogsStore.js
|
2024-03-05 20:12:08 +05:00 |
|
|
22f7edf8b2
|
Fix translation order, useless keys and .babel projects
|
2024-03-05 13:54:02 +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 |
|
|
aa8c7f5d54
|
Web: Client: fixed translates
|
2024-03-04 22:51:28 +05:00 |
|
|
6458ed9c26
|
Merge branch 'develop' into feature/groups
# Conflicts:
# packages/client/src/pages/Home/Section/AccountsBody/Groups/TableView/GroupsTableItem.js
# packages/client/src/store/GroupsStore.ts
|
2024-03-04 18:52:18 +04:00 |
|
|
bfd1a04638
|
Fix empty SSO label issue
|
2024-03-04 15:05:39 +03:00 |
|
namushka
|
a59b90fa28
|
fix empty screen translations
|
2024-03-04 13:32:32 +03:00 |
|
|
f72d8af2b9
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# packages/client/src/store/index.js
# public/locales/en/Common.json
|
2024-03-04 14:30:41 +04:00 |
|