|
|
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 |
|
|
|
89fde015d3
|
Merge pull request #301 from ONLYOFFICE/feature/translations-updates
Feature/translations updates
|
2024-03-05 13:38:17 +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 |
|
|
|
7c746e54ce
|
Editor: Added customization config from JS-SDK
|
2024-03-05 12:16:27 +03: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 |
|
Vladimir Khvan
|
a993ad2045
|
Web: Client: JavascriptSDK: max width and height were set on frame / default preview sizes were corrected
|
2024-03-04 21:39:01 +05:00 |
|
Vladimir Khvan
|
f5e4f141ae
|
Web: Client: JavascriptSDK: isDocument icon prop was added to FileInput
|
2024-03-04 20:57:50 +05:00 |
|
|
|
f6a951918c
|
Merge branch 'develop' into feature/groups
|
2024-03-04 19:46:24 +04:00 |
|
|
|
31686a8f17
|
Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-03-04 18:15:05 +03:00 |
|
|
|
eaaadbd89f
|
JS-SDK: remove svg loader, add loader with style tag
|
2024-03-04 18:14:58 +03: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 |
|
|
|
4e1e6be979
|
Added more flexible way to check CSP
|
2024-03-04 18:34:23 +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 |
|
|
|
63540ab04f
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-03-04 11:32:47 +04:00 |
|
|
|
56b0b322e9
|
Web: fix translate
|
2024-03-01 14:03:23 +03:00 |
|
|
|
718455ee09
|
Web: added xlsb icons
|
2024-03-01 15:37:04 +05:00 |
|
|
|
ab454da48e
|
Merge branch 'develop' into feature/groups
|
2024-03-01 11:31:28 +01:00 |
|
|
|
828e159767
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-03-01 11:52:08 +04:00 |
|
namushka
|
d4134fa09b
|
merge develop + merge fix
Conflicts:
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableContainer.js
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
|
2024-03-01 02:18:24 +03:00 |
|
|
|
8261228759
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-29 18:08:07 +03:00 |
|
|
|
40a8db9d4c
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-29 18:00:55 +03:00 |
|
|
|
6152d587c6
|
Merge pull request #264 from ONLYOFFICE/feature/ads-banner
feature/ads-banner
|
2024-02-29 18:24:57 +04:00 |
|
|
|
55d54d63b2
|
updated it, hy
|
2024-02-29 15:22:55 +03:00 |
|
Vladimir Khvan
|
800a2945f6
|
Web: Client: JavascriptSDK: presets images were changed
|
2024-02-29 13:48:03 +05: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 |
|
|
|
daa1f5c95a
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-29 00:05:12 +03:00 |
|
|
|
763870416c
|
updated translations
|
2024-02-28 19:18:54 +03:00 |
|
|
|
acc19b269c
|
Merge branch 'develop' into feature/groups
# Conflicts:
# packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/HeadOfGroupParam/index.tsx
|
2024-02-27 16:32:55 +01: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 |
|
|
|
6ff44125b7
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-27 09:26:24 +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 |
|
