|
305ce4be0b
|
Translations: Rename keys LinkSettings -> LinkSetDescription (fix test issue)
|
2024-04-11 09:14:09 +04:00 |
|
|
f0379f9c55
|
Merge branch 'release/v2.5.0' into feature/new-translations_v.2.5
|
2024-04-11 08:43:42 +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 |
|
|
14840653de
|
Merge branch 'release/v2.5.0' into feature/sdk-codeblock-redesign
|
2024-04-10 14:00:46 +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 |
|
Vladimir Khvan
|
9984a02ce7
|
Merge branch 'develop' into feature/sdk-presets
Conflicts:
packages/shared/enums/index.ts
packages/shared/selectors/Files/FilesSelector.types.ts
packages/shared/selectors/Files/hooks/useFilesHelper.ts
|
2024-04-09 15:07:00 +05:00 |
|
Vladimir Khvan
|
a47dfd1095
|
Web: Client: JavascriptSDK: translation was corrected
|
2024-04-09 13:38:03 +05:00 |
|
|
013fd4a8be
|
Web: move translations to Common
|
2024-04-09 10:35:07 +03:00 |
|
Akmal Isomadinov
|
4eff1fb58a
|
Merge branch 'develop' into feature/form-room
|
2024-04-09 12:11:24 +05:00 |
|
Akmal Isomadinov
|
6ca6f71ccf
|
Client:Components:EmptyView Added translations, updated icons and added upload option
|
2024-04-08 20:10:38 +05: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 |
|
|
b1e363fcbf
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/pages/Home/Section/Header/index.js
|
2024-04-08 01:20:28 +04:00 |
|
|
678d73fbd6
|
Client: CommonStore: Rollbacked reload property for update and restore logos
|
2024-04-05 17:17:30 +03:00 |
|
|
c9be365f3c
|
added translation
|
2024-04-05 15:20:44 +03:00 |
|
|
010f63e5d2
|
added translations
|
2024-04-04 18:26:42 +03:00 |
|
|
50815e71fc
|
Branding: Applied refresh logos
|
2024-04-04 18:31:39 +04:00 |
|
|
efce822b4b
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/components/FilesSelector/index.tsx
# packages/client/src/components/FilesSelector/utils.ts
# packages/doceditor/src/app/create/page.tsx
# packages/doceditor/src/utils/actions.ts
|
2024-04-04 16:54:37 +04:00 |
|
|
dff582b132
|
Merge branch 'release/v2.5.0' into feature/logo-handler
# Conflicts:
# packages/doceditor/src/components/deep-link/index.tsx
|
2024-04-04 14:27:30 +03:00 |
|
Vladimir Khvan
|
f6013c0b13
|
Fix Bug 67242 - Data import. Fixed breakpoint / corrected translations
|
2024-04-04 14:09:57 +05: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 |
|
|
d33afb1bdc
|
added translations
|
2024-04-03 23:02:16 +03:00 |
|
|
7bf8572375
|
Merge branch 'release/v2.5.0' into feature/logo-handler
|
2024-04-03 16:27:57 +04:00 |
|
|
403eaa2b0f
|
Merge branch 'release/v2.5.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.5.0
|
2024-04-03 16:51:50 +05:00 |
|
|
20e7c65907
|
Web: Client: fix group is deleted without confirmation
|
2024-04-03 16:51:42 +05:00 |
|
Vladimir Khvan
|
49ae08058f
|
Web: Client: JavascriptSDK: translation was corrected
|
2024-04-03 15:55:57 +05:00 |
|
Vladimir Khvan
|
b103ce73a3
|
Merge branch 'release/v2.5.0' into bugfix/data-migration
|
2024-04-03 14:27:47 +05:00 |
|
|
b8ddf6bd9d
|
added translations
|
2024-04-02 18:24:47 +03:00 |
|
Vladimir Khvan
|
6fe945fec8
|
Web: Client: JavascriptSDK: available editing option was added to files selector / filtering options were added
|
2024-04-02 18:30:45 +05:00 |
|
|
43b36f7633
|
Merge branch 'release/v2.5.0' into feature/logo-handler
|
2024-04-02 15:48:35 +04:00 |
|
Akmal Isomadinov
|
f25805efcb
|
Client:Dialogs:CreatedPDFFormDialog Added toast
|
2024-04-02 15:52:56 +05:00 |
|
namushka
|
825d8626a8
|
Merge branch 'release/v2.5.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.5.0
|
2024-04-02 13:30:47 +03:00 |
|
namushka
|
f33a833b49
|
revert adding guide links as translation keys
|
2024-04-02 13:30:44 +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 |
|
Vladimir Khvan
|
f29fd12e91
|
Web: Client: Data import: error was added if there is no users in backup
|
2024-04-02 12:42:26 +05:00 |
|
|
7690966367
|
Client: PortalSettings: Change code block for JS SDK
|
2024-04-02 08:27:52 +03:00 |
|
|
5454e3ba01
|
Merge branch 'release/v2.5.0' into feature/logo-handler
|
2024-04-02 08:24:08 +03:00 |
|
|
7790adb782
|
Web: Files: ThirdParty: fixed translations
|
2024-04-01 17:42:39 +03:00 |
|
|
55cd2f5053
|
Merge branch 'release/v2.5.0' into feature/logo-handler
|
2024-03-29 13:04:16 +03:00 |
|
Akmal Isomadinov
|
b2d73e8f48
|
Client:Public:Locales:CreatedPDFFormDialog Added translations
|
2024-03-28 22:53:15 +05:00 |
|
|
9c1818010c
|
Fix crash on window.DocSpaceConfig is undefined
|
2024-03-28 16:32:05 +04:00 |
|
Akmal Isomadinov
|
22002269ab
|
Client:Dialog: Added CreatedPDFFormDialog
|
2024-03-28 17:04:16 +05:00 |
|
|
dfa370d8ae
|
Merge branch 'release/v2.5.0' into feature/logo-handler
|
2024-03-28 09:39:46 +03:00 |
|
|
46835e7a40
|
added translations
|
2024-03-27 17:24:48 +03:00 |
|
namushka
|
62f013599f
|
added language specific guide links as translation keys (temp)
|
2024-03-27 17:10:16 +03:00 |
|
|
3be0ec8572
|
Clients: Changed favicon for all index.html
|
2024-03-27 15:09:12 +03:00 |
|
|
89885c8c50
|
Client:ChangeRoomOwnerPanel: add info block
|
2024-03-27 13:07:12 +03:00 |
|
|
fbbfd019db
|
Client: Replaced get favicon to new handler
|
2024-03-27 12:31:25 +04:00 |
|
Vladimir Khvan
|
3d1636f32a
|
Merge branch 'develop' into feature/connecting-storage
|
2024-03-26 16:34:12 +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 |
|
namushka
|
b1a4cb158d
|
fix translations
|
2024-03-26 12:23:29 +03:00 |
|
Vladimir Khvan
|
662b9fbbd5
|
Merge branch 'develop' into feature/connecting-storage
Conflicts:
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ThirdPartyStorage/index.js
|
2024-03-26 13:12:21 +05:00 |
|
|
be837a17a8
|
Client: PortalSettings: JavascriptSDK: Added CSP info bar
|
2024-03-25 21:40:17 +03:00 |
|
|
5d704a3456
|
Web: Public: added custom favicon from storage
|
2024-03-25 19:09:22 +05:00 |
|
|
a98d1060ed
|
added hy, pt-BR
|
2024-03-22 17:04:42 +03:00 |
|
|
027646f8ea
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/doceditor/src/app/global-error.tsx
# packages/doceditor/src/components/Root.tsx
# packages/doceditor/src/hooks/useUpdateSearchParamId.ts
# packages/doceditor/src/utils/actions.ts
# packages/doceditor/src/utils/index.ts
|
2024-03-22 16:20:48 +04:00 |
|
|
62211d8f18
|
Client:Public:Locales: delete useless web plugins translation keys
|
2024-03-21 10:41:41 +03:00 |
|
Vladimir Khvan
|
c34e06d6f7
|
Web: Client: added thirdparty storage connecting options
|
2024-03-20 13:36:05 +05:00 |
|
|
681e8b9d47
|
Fix bug 66973 - Web: Client: added custom favicon display by default
|
2024-03-19 15:43:47 +05:00 |
|
|
2d11fbf5bb
|
edited en
|
2024-03-19 12:46:56 +03:00 |
|
|
a5a2fbe763
|
edited en
|
2024-03-18 16:37:46 +03:00 |
|
|
043f584109
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/components/FilesPanels/index.js
|
2024-03-18 14:55:42 +04:00 |
|
|
5693eecabf
|
Translations: removed useless keys
|
2024-03-18 14:15:11 +04: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 |
|
|
3e3ad35099
|
Web: Client: Data import fixed error text
|
2024-03-12 14:37:10 +05:00 |
|
|
8ca7c66682
|
Remove useless tKey
|
2024-03-07 20:27:12 +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 |
|
Vladimir Khvan
|
bade21ca95
|
Web: Client: JavascriptSDK: translations were corrected
|
2024-03-07 12:22:39 +05:00 |
|
Vladimir Khvan
|
dd4709806c
|
Merge branch 'develop' into bugfix/sdk-presets
Conflicts:
packages/client/public/locales/en/JavascriptSdk.json
|
2024-03-07 12:15:20 +05:00 |
|
|
59bc5c30a6
|
Merge pull request #303 from ONLYOFFICE/feature/data-migration
feature/data-migration
|
2024-03-06 21:07:37 +04:00 |
|
|
66bc51ea9f
|
Web: Client: fixed translates
|
2024-03-06 20:40:26 +05:00 |
|
|
52cba52326
|
Web: Files: added "Create a new folder in the storage" checkbox
|
2024-03-06 17:27:57 +03:00 |
|
Akmal Isomadinov
|
fe26a57c41
|
Merge branch 'develop' into feature/redesign-form-filling-room
|
2024-03-06 16:29:27 +05:00 |
|
Vladimir Khvan
|
8a08815a97
|
Web: Client: JavascriptSDK: preview empty screen text was corrected
|
2024-03-06 16:02:47 +05:00 |
|
Vladimir Khvan
|
8445e9dcce
|
Web: Client: JavascriptSDK: shared link settings hint was added
|
2024-03-06 15:54:34 +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 |
|
|
c2e77f8d77
|
Fix NotTranslatedPropsTest issues
|
2024-03-06 02:49:56 +04:00 |
|
|
a1c8069301
|
Fix NotFoundKeysTest issues
|
2024-03-06 02:23:47 +04:00 |
|
|
39ae48c524
|
Fix FullEnDublicatesTest issues
|
2024-03-06 01:59:38 +04:00 |
|
|
176d1c7f16
|
Merge branch 'develop' into feature/data-migration
|
2024-03-05 22:09:00 +04:00 |
|
Akmal Isomadinov
|
0c05f3abc3
|
Client:Public: Disabled google translator
|
2024-03-05 22:43:50 +05: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 |
|
|
84fc187a27
|
Merge branch 'develop' into feature/groups
|
2024-03-04 21:55:21 +04:00 |
|
|
aa8c7f5d54
|
Web: Client: fixed translates
|
2024-03-04 22:51:28 +05:00 |
|
|
a8c0fd36b1
|
Merge branch 'develop' into bugfix/sdk-presets
|
2024-03-04 20:57:09 +04: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 |
|
Vladimir Khvan
|
59eb4ec57c
|
Web: Client: JavascriptSDK: translations were corrected
|
2024-03-04 19:13:27 +05: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 |
|
namushka
|
fd95aab885
|
added people counter to info-
panel/groups
|
2024-03-04 13:06:24 +03:00 |
|
|
65a534f633
|
Web: Client: Locales: added keys for dns settings hint
|
2024-03-01 20:17:24 +05: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 |
|
Akmal Isomadinov
|
cadb812e37
|
Merge branch 'develop' into feature/redesign-form-filling-room
|
2024-02-27 12:23:31 +05: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 |
|
Akmal Isomadinov
|
ec9c3ce889
|
Merge branch 'develop' into feature/redesign-form-filling-room
|
2024-02-23 17:23:57 +05:00 |
|
|
535b94cd41
|
Merge branch 'bugfix/rc-2.5.0' of https://github.com/ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-02-22 16:49:59 +03:00 |
|
|
3890aa323a
|
edited es
|
2024-02-22 16:49:14 +03:00 |
|
|
7b851cac74
|
Web: Files: added HexCode translation
|
2024-02-22 16:42:00 +03:00 |
|
|
508833e20c
|
Web: Fixed registration form if the user received an invitation by email.
|
2024-02-22 15:04:50 +03:00 |
|
|
1125472aad
|
Web: Registration form added.
|
2024-02-22 14:28:39 +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 |
|
Akmal Isomadinov
|
da1c884ef1
|
Merge branch 'develop' into feature/redesign-form-filling-room
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
|
2024-02-21 22:57:34 +05: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 |
|
Vladimir Khvan
|
446be44db4
|
Merge branch 'develop' into feature/data-migration
Conflicts:
public/locales/en/Common.json
|
2024-02-20 14:03:51 +05:00 |
|
|
5752c6a0b6
|
Fix groups translations
|
2024-02-20 00:30:49 +04:00 |
|
|
44606c2813
|
Fix bad translations
|
2024-02-19 19:46:53 +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 |
|
Akmal Isomadinov
|
08659426ef
|
Client:FormFilingRoom Fixed title and description of the room
|
2024-02-19 13:31:02 +05:00 |
|
|
1331d15855
|
Web: ConfirmPage: Styles changed.
|
2024-02-16 23:32:00 +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 |
|
|
3380ea9318
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/helpers/enums.ts
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/TableStore.js
|
2024-02-15 12:08:27 +03:00 |
|
|
6980f088bd
|
Merge branch 'develop' into bugfix/my-documents-share
|
2024-02-14 16:29:35 +04: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 |
|
|
20887d0f4b
|
Move some error translation keys to common
|
2024-02-14 02:27:50 +04:00 |
|