|
364c25a813
|
Added interpolation for 'BetaBadgeDescription' key.
|
2024-05-30 16:36:00 +03:00 |
|
Akmal Isomadinov
|
6a9410379d
|
Client:Dialogs:CreatedPDFFormDialog Added actions and update icons
|
2024-05-30 18:14:00 +05:00 |
|
|
1809b8cd92
|
Added interpolation for 'TurnOffDiskSpaceLimit key.
|
2024-05-30 14:57:14 +03:00 |
|
|
3313d4f020
|
Added interpolation for 'SetDiskSpaceQuota' key.
|
2024-05-30 14:54:02 +03:00 |
|
|
c02cc44108
|
Added interpolation for 'PortalRestriction' key.
|
2024-05-30 14:48:46 +03:00 |
|
|
ab7d326315
|
Added interpolation for 'InvitationToPortal' key.
|
2024-05-30 14:39:57 +03:00 |
|
|
706d28344b
|
Added interpolation for 'ErrorDeactivatedText' key.
|
2024-05-30 14:30:22 +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 |
|
|
0ca78803ab
|
added sr-Cyrl
|
2024-05-29 15:18:22 +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 |
|
|
996c79d617
|
Revert "Merge branch 'develop'"
This reverts commit da29dab3bf .
|
2024-05-28 14:05:49 +03:00 |
|
|
da29dab3bf
|
Merge branch 'develop'
|
2024-05-28 14:04:24 +03:00 |
|
|
02b4294e63
|
Merge branch 'develop' into feature/oauth2-client
|
2024-05-28 10:32:48 +03:00 |
|
Akmal Isomadinov
|
10231dee4c
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/pages/Home/Section/Header/index.js
|
2024-05-28 11:07:30 +05:00 |
|
Akmal Isomadinov
|
5b32ed6d88
|
Client: Fix translation
|
2024-05-27 18:36:45 +05:00 |
|
|
da064a698f
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-27 16:23:36 +04:00 |
|
Akmal Isomadinov
|
ad48bac511
|
Client:Components:MainButton Added new actions
|
2024-05-24 20:12:47 +05:00 |
|
|
3bb3c7d5ea
|
Merge branch 'develop' into feature/oauth2-client
|
2024-05-23 18:23:05 +03: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 |
|
|
467f53220f
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-13 19:10:03 +04:00 |
|
|
981afb7fa2
|
updated si
|
2024-05-13 16:18:53 +03:00 |
|
|
df9ced222f
|
Merge branch 'develop' into bugfix/form-room
|
2024-05-07 20:26:54 +04:00 |
|
Akmal Isomadinov
|
0ed0fc2e18
|
Client:Components:Badges Fixed translation
|
2024-05-07 18:39:54 +05:00 |
|
Vladimir Khvan
|
6c7e8caa8d
|
Merge branch 'develop' into feature/sdk-presets
|
2024-05-07 15:30:30 +05:00 |
|
|
4f2295c2d8
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-03 14:51:27 +04:00 |
|
|
b52e7af32c
|
Fix Bug 67813
No translation of Share panel in editor
|
2024-05-03 12:32:58 +03:00 |
|
|
ee84c16335
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-02 15:05:36 +04:00 |
|
|
c1269a6a60
|
edited zh
|
2024-05-02 13:45:15 +03:00 |
|
Vladimir Khvan
|
e4ab7e11e4
|
Merge branch 'develop' into feature/sdk-presets
|
2024-04-30 02:09:42 +05:00 |
|
|
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 |
|
|
8b4bb07568
|
Translations: Common: Removed old key 'SelectIMGFormat'
|
2024-04-26 16:42:07 +04:00 |
|
|
1ab2c02025
|
Merge branch 'develop' into feature/sdk-presets
# Conflicts:
# public/locales/en/Common.json
|
2024-04-26 16:40:45 +04:00 |
|
Vladimir Khvan
|
c308e5560e
|
Web: Client: JavascriptSDK: corrected translations for fileSelector presets
|
2024-04-23 15:54:47 +05: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 |
|
|
5c7a15c5f8
|
edited zh 'people'
|
2024-04-19 13:12:23 +03:00 |
|
|
fff1f996bd
|
edited ar 'sign up/sign in'
|
2024-04-19 13:08:34 +03: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 |
|
|
e27bad8eae
|
Merge branch 'release/v2.5.0' into develop
|
2024-04-12 20:13:01 +04:00 |
|
|
1f2260e5a0
|
Translations: Fix bad tag in keys InvitationToPortal, InvitationToRoom
|
2024-04-12 20:05:39 +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 |
|
|
9afb296b5d
|
updated hy
|
2024-04-12 16:59:47 +03:00 |
|
Akmal Isomadinov
|
7c4adde668
|
Merge branch 'develop' into feature/form-room
|
2024-04-12 11:36:53 +05:00 |
|
|
0ee71165ac
|
added sr-latn-RS
|
2024-04-11 19:48:03 +03:00 |
|
|
5752bb3a2d
|
updated translations
|
2024-04-11 16:21:30 +03: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 |
|
|
24d9d0e431
|
Translations: Fix WrongTranslationVariablesTest issues
|
2024-04-11 09:49:48 +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 |
|
|
5369fae080
|
Merge branch 'feature/new-translations_v.2.5' of github.com:ONLYOFFICE/DocSpace-client into feature/new-translations_v.2.5
|
2024-04-10 18:28:20 +04: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 |
|
|
af240bb9ef
|
added translations
|
2024-04-10 16:48:51 +03:00 |
|
|
07d20cd9da
|
added translations
|
2024-04-10 15:30:25 +03:00 |
|
|
7bb8ee3295
|
added it
|
2024-04-09 18:04:38 +03: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 |
|
|
3550bea206
|
Update translations [ru]
|
2024-04-08 11:29:56 +03:00 |
|
|
76c29e1335
|
Merge branch 'develop' into feature/form-room-modals
|
2024-04-08 01:39:14 +04:00 |
|
|
010f63e5d2
|
added translations
|
2024-04-04 18:26:42 +03: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 |
|
|
b8ddf6bd9d
|
added translations
|
2024-04-02 18:24:47 +03:00 |
|
Vladimir Khvan
|
3ec31707ce
|
Merge branch 'release/v2.5.0' of https://github.com/ONLYOFFICE/DocSpace-client into bugfix/data-migration
|
2024-04-02 12:43:19 +05:00 |
|
|
c78075bf35
|
added translations
|
2024-04-01 18:31:03 +03:00 |
|
|
7790adb782
|
Web: Files: ThirdParty: fixed translations
|
2024-04-01 17:42:39 +03:00 |
|
Vladimir Khvan
|
c0509ca855
|
Web: Client: translation was corrected
|
2024-04-01 15:25:53 +05: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 |
|
|
46835e7a40
|
added translations
|
2024-03-27 17:24:48 +03: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 |
|
namushka
|
b1a4cb158d
|
fix translations
|
2024-03-26 12:23:29 +03:00 |
|
|
a98d1060ed
|
added hy, pt-BR
|
2024-03-22 17:04:42 +03: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 |
|
|
8fdd6d33dc
|
Fix EmptyValueKeysTest issues (moved si keys to common)
|
2024-03-06 04:02:05 +04:00 |
|
|
916242f5b3
|
Fix si language issues in client and common
|
2024-03-06 03:21:47 +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 |
|
|
5c6a836b14
|
Merge branch 'develop' into feature/translations-updates
# Conflicts:
# i18next/common.babel
# packages/client/public/locales/bg/Files.json
# packages/client/public/locales/es/Files.json
# packages/client/public/locales/it/WebPlugins.json
# packages/client/public/locales/ja-JP/Errors.json
# packages/client/public/locales/ja-JP/Files.json
# packages/client/public/locales/ja-JP/InviteDialog.json
# packages/client/public/locales/ja-JP/Settings.json
# packages/client/public/locales/vi/Files.json
|
2024-03-05 13:36:51 +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 |
|
|
56b0b322e9
|
Web: fix translate
|
2024-03-01 14:03:23 +03:00 |
|
|
828e159767
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-03-01 11:52:08 +04:00 |
|
|
40a8db9d4c
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-29 18:00:55 +03:00 |
|
|
55d54d63b2
|
updated it, hy
|
2024-02-29 15:22:55 +03:00 |
|
|
95c2928f38
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# packages/shared/components/table/sub-components/TableHeaderCell.tsx
|
2024-02-29 11:41:02 +04:00 |
|
|
f9b0599a07
|
Merge branch 'bugfix/rc-2.5.0' into develop
|
2024-02-29 11:04:48 +04:00 |
|
|
763870416c
|
updated translations
|
2024-02-28 19:18:54 +03:00 |
|
|
852c960163
|
Move some translation keys to Common
|
2024-02-27 15:24:17 +04:00 |
|
|
8aef7caf62
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-27 12:53:21 +03:00 |
|
Vladimir Khvan
|
abb8ee3464
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/public/locales/en/People.json
packages/client/public/locales/en/Settings.json
packages/client/public/locales/ru/People.json
packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
packages/client/src/pages/PortalSettings/utils/settingsTree.js
packages/client/src/store/index.js
packages/shared/enums/index.ts
packages/shared/themes/base.ts
packages/shared/themes/dark.ts
|
2024-02-27 14:51:49 +05:00 |
|
|
eb127578b2
|
Merge branch 'feature/invite-page-redesign' of https://github.com/ONLYOFFICE/DocSpace-client into feature/invite-page-redesign
# Conflicts:
# public/locales/en/Common.json
|
2024-02-27 11:47:46 +03:00 |
|
|
8df0a29166
|
Web: Shared: Added translation.
|
2024-02-27 09:16:55 +03:00 |
|
|
15ddf95e3b
|
Merge branch 'develop' into feature/invite-page-redesign
|
2024-02-26 20:49:56 +04:00 |
|
|
a77a82f2b2
|
updated zh
|
2024-02-26 13:45:31 +03:00 |
|
|
11da227257
|
Fix translation issues
|
2024-02-26 12:06:12 +03:00 |
|
|
b5f706a635
|
Web: Fixed provider titles.
|
2024-02-26 11:53:11 +03:00 |
|
|
3890aa323a
|
edited es
|
2024-02-22 16:49:14 +03:00 |
|
|
e9d13a6452
|
Applied babelEdit auto-fixes
|
2024-02-22 13:22:16 +04:00 |
|
|
5f744636a5
|
Translations: move Files:CreateAndCopy to Common
|
2024-02-22 13:17:26 +04:00 |
|
|
c4d69493d9
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-22 10:05:57 +03:00 |
|
|
ef3b07707a
|
edited fr
|
2024-02-21 18:19:59 +03:00 |
|
|
560958351a
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-21 16:26:10 +03:00 |
|
|
eacad7f98f
|
Move translation keys from GroupsSelector to Common
|
2024-02-21 16:12:14 +03:00 |
|
|
80645ee784
|
Web: Added greeting container.
|
2024-02-21 12:40:19 +03:00 |
|
|
1749f5a9d0
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/components/GlobalEvents/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
# packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/PeopleStore.js
# packages/client/src/store/index.js
# packages/shared/api/people/filter.js
# packages/shared/enums/index.ts
|
2024-02-20 19:43:27 +03:00 |
|
|
dfe05b707a
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-20 14:36:45 +03:00 |
|
|
9573816860
|
Merge branch 'develop' into feature/oauth2-client
|
2024-02-20 12:43:09 +03:00 |
|
Vladimir Khvan
|
446be44db4
|
Merge branch 'develop' into feature/data-migration
Conflicts:
public/locales/en/Common.json
|
2024-02-20 14:03:51 +05:00 |
|
|
1f4520c9da
|
Web: Added a block with recovery access.
|
2024-02-20 11:45:23 +03:00 |
|
|
5752c6a0b6
|
Fix groups translations
|
2024-02-20 00:30:49 +04:00 |
|
namushka
|
b672c0579c
|
translations update 2 + fixed insideGroup Department column
|
2024-02-19 17:41:44 +03:00 |
|
namushka
|
d796213a67
|
Translations update
|
2024-02-19 16:05:06 +03:00 |
|
Vladimir Khvan
|
2bb8ef1d49
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/src/components/dialogs/index.js
packages/client/src/routes/portalSettings.js
|
2024-02-19 14:28:07 +05:00 |
|
|
80684f33fa
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-19 11:52:55 +03:00 |
|
namushka
|
f39f000d01
|
Merge branch 'develop' into feature/groups
# Conflicts:
# packages/client/src/components/panels/AddUsersPanel/index.js
# packages/client/src/helpers/constants.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/Home/Section/Submenu/index.js
# packages/client/src/routes/client.js
|
2024-02-16 13:40:01 +03:00 |
|
|
405406d9e5
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/routes/portalSettings.js
# public/locales/en/Common.json
|
2024-02-14 14:19:11 +03:00 |
|
|
d47aa36c85
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-14 13:57:36 +03:00 |
|
|
3dc49cf352
|
Auto-refactoring of translations
|
2024-02-14 13:16:02 +04:00 |
|
|
5b28408a17
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/store/SelectedFolderStore.js
# packages/client/src/store/TableStore.js
# packages/client/src/store/index.js
# packages/shared/store/CurrentQuotaStore.ts
# packages/shared/utils/common.ts
# public/locales/en/Common.json
|
2024-02-14 12:15:32 +03:00 |
|