Commit Graph

1667 Commits

Author SHA1 Message Date
2a9a2e1eae JS-SDK: Revert frames save 2024-04-09 18:53:46 +04:00
e565846ba1 Revert "JS-SDK: Re-written init methods (move to DocSpaceSDK)"
This reverts commit a31fea03e7.

# Conflicts:
#	public/scripts/api.js
2024-04-09 17:49:46 +03:00
Akmal Isomadinov
89d79ea51f Client:Dialogs:CreatedPDFFormDialog Update translations 2024-04-09 18:50:21 +05:00
f7768fb4a1 JS-SDK: Fix re-init DocSpaceSDK + change frame type 2024-04-09 14:50:41 +04:00
Akmal Isomadinov
de5b57ce2e Client:MainButton:Actions Removed FromReadyTemplate 2024-04-09 14:38:47 +05:00
9176efb3ba JS-SDK: fix wrong scope 2024-04-09 13:29:44 +04:00
09e5ad1bdf Merge branch 'release/v2.5.0' into bugfix/api-sdk 2024-04-09 13:25:58 +04:00
Vladimir Khvan
7dece72be7 Fix Bug 66855 - script url was corrected 2024-04-09 14:08:07 +05:00
e6188966b7 JS_SDK: Optimization: use base method 2024-04-09 13:04:23 +04:00
a31fea03e7 JS-SDK: Re-written init methods (move to DocSpaceSDK) 2024-04-09 12:08:30 +04:00
1d96fa2dc9 JS-SDK: Added Docs 2024-04-09 11:48:13 +04:00
9d7ab85508 JS-SDK: Fix run with multi-instances on the same page 2024-04-09 11:37:55 +04: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
39a6a50f19 Merge branch 'release/v2.5.0' into develop 2024-04-08 18:23:49 +04:00
Akmal Isomadinov
94115667df Client:Components:EmptyView Update empty icon 2024-04-08 17:58:14 +05:00
9f39abbffe Web: Scripts: Restored default config property for sdk 2024-04-08 13:16:42 +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
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
7e32763dff Merge branch 'release/v2.5.0' into feature/logo-handler 2024-04-05 15:54:34 +03:00
7671855f14 Web: Files: Public: fixed styles 2024-04-05 14:03:44 +03: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
9b5a62ee24 Merge branch 'release/v2.5.0' into feature/logo-handler 2024-04-04 10:06:33 +03:00
40df0fe348 Web: Client: Groups. fixed empty screen svg 2024-04-03 18:10:33 +05:00
7bf8572375 Merge branch 'release/v2.5.0' into feature/logo-handler 2024-04-03 16:27:57 +04:00
fcde4392fd Public: Remove doubled favicon.ico 2024-04-03 14:57:30 +03:00
Vladimir Khvan
b103ce73a3 Merge branch 'release/v2.5.0' into bugfix/data-migration 2024-04-03 14:27:47 +05:00
c847ef1545 Merge branch 'release/v2.5.0' into feature/logo-handler 2024-04-03 09:55:06 +03:00
b8ddf6bd9d added translations 2024-04-02 18:24:47 +03:00
d3f226f48a Shared: Tag: delete useless 2024-04-02 16:30:45 +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
fcd18f0742 Client: Logo from handler 2024-04-02 08:25:21 +03:00
5454e3ba01 Merge branch 'release/v2.5.0' into feature/logo-handler 2024-04-02 08:24:08 +03: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
3be0ec8572 Clients: Changed favicon for all index.html 2024-03-27 15:09:12 +03:00
6df80dac35 Client: ProfileActionsStore: Added SDK showSignOut property usage. 2024-03-26 14:37:38 +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
Vladimir Khvan
b41e0d05cf Merge branch 'release/v2.5.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.5.0 2024-03-26 14:35:23 +05:00
Vladimir Khvan
11189a341a Web: Client: JavascriptSDK: hint images for options in dark mode were corrected 2024-03-26 14:35:06 +05: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
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
c9234fec72 Replaced copyright start year + format 2024-03-21 18:09:55 +04:00
2d11fbf5bb edited en 2024-03-19 12:46:56 +03:00
5b307ab0bd JS-SDK: Restored editorCustomization by default 2024-03-19 10:49:06 +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
adcc11094d Copyright 2024 2024-03-18 03:13:02 +04:00
59cc588fb1 Merge branch 'release/v2.5.0' into develop 2024-03-15 15:48:39 +04:00
Vladimir Khvan
3bb4447673 Web: Client: JavascriptSDK: hint images for options were corrected 2024-03-15 16:00:02 +05:00
Vladimir Khvan
471c1a1208 Web: Client: JavascriptSDK: viewer preset tile image was corrected 2024-03-15 15:58:50 +05: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
Vladimir Khvan
5e38e94e78 Web: Client: JavascriptSDK: viewer preset tile image was changed 2024-03-14 14:40:00 +05: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
08024496a1 JS-SDK: Added downloadToEvent property and onDownload event 2024-03-11 21:58:03 +03:00
21fe91be15 DocEditor: Added editorType property for DocumentEditor component configuration 2024-03-11 17:32:39 +03:00
e4d24cc204 Fixed Bug 66785 - Settings: Javascript SDK. XSS in the Select Button Text and Cancel Button Text fields in the Room Selector. 2024-03-11 11:24:43 +03: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
Akmal Isomadinov
fe26a57c41 Merge branch 'develop' into feature/redesign-form-filling-room 2024-03-06 16:29:27 +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
Akmal Isomadinov
cadb812e37 Merge branch 'develop' into feature/redesign-form-filling-room 2024-02-27 12:23:31 +05: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
9e8f3caa16 Merge branch 'develop' into bugfix/rc-2.5.0 2024-02-26 20:48:53 +04:00
bfc6767c02 renamed form gallery error image 2024-02-26 20:24:30 +05:00
7392fc08cd added custom error images 2024-02-26 20:20:14 +05:00
Akmal Isomadinov
10750896d9 Public:Images: Updated done/progress icons 2024-02-26 18:00:00 +05:00
a77a82f2b2 updated zh 2024-02-26 13:45:31 +03:00
412765e3af Web: Icon added, styles corrected. 2024-02-26 12:49:37 +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
Akmal Isomadinov
9777b20d29 Client:Components: Added an empty view without translations 2024-02-23 22:00:43 +05:00
Akmal Isomadinov
ec9c3ce889 Merge branch 'develop' into feature/redesign-form-filling-room 2024-02-23 17:23:57 +05:00
112fdb1839 Merge branch 'develop' into feature/ads-banner
# Conflicts:
#	packages/shared/components/article/sub-components/SubmitToFormGalleryAlert.tsx
2024-02-22 20:05:26 +04: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
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
Akmal Isomadinov
0b86876e72 Client: Added icons 2024-02-21 22:28:03 +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
6afe75a43e Web: fix default campaigns list 2024-02-21 12:13:09 +03:00
3fa4ecfdb7 Merge branch 'develop' into feature/ads-banner 2024-02-20 23:37:40 +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
namushka
ac6e8192ac Merge branch 'feature/groups' of https://github.com/ONLYOFFICE/DocSpace-client into feature/groups 2024-02-20 12:55:55 +03:00
namushka
fdac12fc8b fixed icons 2024-02-20 12:48:58 +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