Commit Graph

527 Commits

Author SHA1 Message Date
84fc187a27 Merge branch 'develop' into feature/groups 2024-03-04 21:55:21 +04:00
a8c0fd36b1 Merge branch 'develop' into bugfix/sdk-presets 2024-03-04 20:57:09 +04:00
Vladimir Khvan
f5e4f141ae Web: Client: JavascriptSDK: isDocument icon prop was added to FileInput 2024-03-04 20:57:50 +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
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
718455ee09 Web: added xlsb icons 2024-03-01 15:37:04 +05: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
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
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
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
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
412765e3af Web: Icon added, styles corrected. 2024-02-26 12:49:37 +03:00
Akmal Isomadinov
9777b20d29 Client:Components: Added an empty view without translations 2024-02-23 22:00:43 +05: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
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
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
d780557c2b Web: Client: Add new empty screen image to GroupsSelector 2024-02-16 14:55:19 +01:00
namushka
eadba5e683 merge origin + merge fix 2024-02-14 15:38:20 +03:00
namushka
b7a711c358 moved basic feats from feature/account-groups (groups table, inside groups table, api, stores, etc.) 2024-02-14 15:35:17 +03: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
eaf83a10d4 Web: Client: Add inviting groups to room 2024-02-13 16:53:24 +01:00
Vladimir Khvan
719ffe2b60 Merge branch 'develop' into feature/data-migration
Conflicts:
	packages/client/src/routes/portalSettings.js
	packages/client/src/store/DialogsStore.js
	packages/client/src/store/index.js
	packages/common/constants/index.js
	packages/components/file-input/index.js
	packages/components/paging/index.js
	packages/components/progress-bar/index.js
	packages/components/row/index.js
	packages/components/table-container/TableGroupMenu.js
	packages/components/themes/base.js
	packages/shared/api/settings/index.ts
	packages/shared/components/paging/Paging.styled.ts
	packages/shared/components/table/sub-components/TableHeaderCell.tsx
	packages/shared/utils/catalogIconHelper.ts
	public/locales/en/Common.json
2024-02-13 16:16:29 +05:00
d385474caa Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/components/GlobalEvents/CreateRoomEvent.js
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/components/MainBar/Bar.js
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Filter/index.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/UsersStore.js
#	packages/client/src/store/index.js
#	packages/common/store/AuthStore.js
#	packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
#	packages/shared/api/files/index.ts
#	packages/shared/api/files/types.ts
#	packages/shared/store/CurrentQuotaStore.ts
#	packages/shared/store/UserStore.ts
#	public/locales/en/Common.json
2024-02-06 11:52:52 +03:00
Vladimir Khvan
498155bea3 Web: Client: JavascriptSDK: dark mode was added for manager 2024-02-02 15:17:27 +05:00
Vladimir Khvan
2bfd15a162 Merge branch 'develop' into feature/js-sdk-presets 2024-02-02 12:40:49 +05:00
Vladimir Khvan
8ec22671bf Web: Client: JavascriptSDK: dark theme was added for presets page 2024-02-01 18:52:05 +05:00
Vladimir Khvan
dcb4b3d276 Web: Client: JavascriptSDK: simple room was added 2024-02-01 13:46:45 +05:00
04a31c61d0 Merge branch 'develop' into feature/public-room
# Conflicts:
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/shared/components/navigation/Navigation.tsx
#	packages/shared/components/navigation/Navigation.types.ts
#	packages/shared/components/navigation/sub-components/ControlBtn.tsx
2024-02-01 11:36:29 +03:00
Vladimir Khvan
a8efee895b Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
	packages/client/src/pages/Sdk/index.js
	packages/shared/selectors/Room/RoomSelector.types.ts
	packages/shared/selectors/Room/index.tsx
2024-01-31 13:36:21 +05:00
e20ae17ab8 Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
#	packages/client/src/pages/Sdk/index.js
#	packages/editor/src/client/components/Editor.js
#	packages/shared/selectors/Room/index.tsx
2024-01-30 18:33:56 +04:00
56c71f61af Web: Files: Public-room: fixed icon 2024-01-30 14:03:50 +03:00
4364f20f6a Web: Files: added public badge 2024-01-30 13:05:17 +03:00
c1d0bb9995 Web: Files: Public-room: fixed links row 2024-01-30 11:05:54 +03:00
230b8cdd7a Merge branch 'hotfix/v2.0.2' into feature/js-sdk-loader 2024-01-29 21:46:15 +03:00
de24cb3330 Images: Loader: Fixed js-sdk loader 2024-01-29 21:41:29 +03:00
68f74565bc Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
#	packages/common/store/AuthStore.js
#	packages/shared/components/selector/Selector.tsx
2024-01-29 19:07:27 +04:00
efeb9be315 Web: Files: Public-room: added navigation button, added new icons 2024-01-29 17:55:55 +03:00
a1fc8864b0 Editor: added new favicon for PDF files 2024-01-29 15:48:57 +04:00
683c628c28 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/components/dialogs/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/SelectedFolderStore.js
#	packages/common/components/Loaders/index.js
#	packages/shared/api/files/index.ts
#	public/locales/en/Common.json
2024-01-28 20:44:38 +03:00
f95d96dfec Merge branch 'hotfix/v2.0.2' into feature/js-sdk-loader 2024-01-25 09:58:14 +03:00
Vladimir Khvan
56e669555d Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
	packages/common/components/Navigation/sub-components/control-btn.js
	packages/shared/components/navigation/Navigation.tsx
	packages/shared/selectors/Room/index.tsx
2024-01-23 16:38:55 +05:00
8811ec7fbd Web: Changed svg. 2024-01-23 11:42:09 +03:00
1adf6b3634 Merge branch 'develop' into feature/my-documents-share 2024-01-19 17:04:46 +04:00
Vladimir Khvan
a8f8c4c1ce Web: Client: JavascriptSDK: help buttons were added 2024-01-19 17:43:20 +05:00
968573ce02 Merge branch 'hotfix/v2.0.1' into develop
# Conflicts:
#	packages/components/toast/styled-toastr.js
2024-01-19 16:20:16 +04:00
1e0c383514 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.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/RowsView/FilesRowContent.js
#	packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
#	packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/api/files/index.js
#	packages/common/constants/index.js
#	packages/common/store/CurrentQuotaStore.js
#	packages/components/combobox/index.js
#	packages/components/themes/base.js
#	packages/components/toggle-button/index.js
#	packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
#	packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
#	packages/shared/api/people/filter.js
#	packages/shared/api/rooms/filter.js
#	packages/shared/utils/common.ts
#	yarn.lock
2024-01-19 11:32:34 +03:00
825c765b7d Merge branch 'develop' into feature/my-documents-share 2024-01-18 20:38:44 +03:00
ba7d2e8029 Fixed checking CSP settings and added design for error 2024-01-18 17:38:08 +03:00
Asadulloev Subhonbek
b84ff87415 web client - add loader in sdk 2024-01-17 15:25:04 +03:00
Vladimir Khvan
d5eb4e35b2 Web: Client: JavascriptSDK: basic button preview was added in Room selector and File selector 2024-01-17 15:10:36 +05:00
596a832dbe Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/public/locales/ru/Settings.json
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/PeopleStore.js
#	packages/common/api/files/index.js
#	packages/components/table-container/TableHeader.js
2024-01-10 12:25:13 +03:00
889d653170 Merge branch 'develop' into feature/form-room-pdf 2023-12-28 15:07:10 +04:00
52092c3aa2 added groups and shared folders options for onlyoffice workspace 2023-12-23 22:13:36 +05:00
Vladimir Khvan
ab3bdbf08b Web: Client: JavascriptSDK: presets tiles were added 2023-12-18 17:46:23 +05:00
Vladimir Khvan
d538c9880f Merge branch 'develop' into feature/data-migration
Conflicts:
	packages/common/utils/axiosClient.js
2023-12-11 14:46:43 +05:00
20d60bba9a Merge branch 'develop' into feature/my-documents-share 2023-12-08 01:15:45 +03:00
70591c1ab9 data import icons were corrected 2023-12-05 13:59:16 +05:00
e3dcded1e6 data import step icons were corrected 2023-12-05 13:47:10 +05:00
bee419003a fixed onlyoffice workspace import step 2023-12-03 14:38:58 +05:00
fed9e05292 Added icons. 2023-11-29 12:44:03 +03:00
7f3ee86798 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/ru/Settings.json
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/PeopleRowContainer.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Body/TableView/sub-components/RoomsRowData.js
#	packages/client/src/pages/Home/Section/Filter/index.js
#	packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
#	packages/client/src/store/FilesStore.js
#	packages/common/store/CurrentQuotaStore.js
#	packages/common/utils/index.ts
#	packages/components/table-container/TableHeader.js
#	public/locales/en/Common.json
2023-11-29 10:56:04 +03:00
Vladimir Khvan
f6c78f3ad8 20x20 data import icon was added 2023-11-23 21:03:14 +05:00
Vladimir Khvan
caa7c632c4 Merge branch 'develop' into feature/data-migration
Conflicts:
	packages/client/public/locales/en/Settings.json
	packages/client/public/locales/ru/Settings.json
	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
	packages/client/src/pages/PortalSettings/utils/settingsTree.js
	packages/client/src/routes/portalSettings.js
	packages/client/src/store/DialogsStore.js
	packages/client/src/store/index.js
	packages/components/table-container/TableHeaderCell.js
	public/locales/en/Common.json
2023-11-22 19:45:10 +05:00
e347aacf11 Merge branch 'develop' into feature/management
# Conflicts:
#	package.json
#	yarn.lock
2023-11-21 12:40:25 +04:00
a284aafe64 Merge branch 'develop' into feature/my-documents-share 2023-11-17 17:44:38 +03:00
14e8945e20 Added missing files 2023-11-17 18:32:52 +04:00
310cda28b5 Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
#	packages/common/utils/image-helpers.js
2023-11-17 18:32:28 +04:00
599056a82d Merge branch 'release/v2.0.0' into feature/plugin-sdk 2023-11-17 13:33:34 +04:00
c41f2e7d14 Client:PluginSDK: add plugin list 2023-11-17 12:01:59 +03:00
Akmal Isomadinov
99b0c90219 Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
#	packages/client/public/locales/en/Files.json
#	packages/common/utils/image-helpers.js
2023-11-17 11:30:49 +05:00
40e941d4db Merge branch 'release/v2.0.0' into feature/form-gallery-error-view 2023-11-16 23:03:36 +04:00
45d74b5fe2 Added icons for file formats: sxc, et, ett, sxi, dps, dpt, sxw, stw, wps, wpt, mhtml 2023-11-16 16:35:22 +03:00
4659c69625 Web: Public: Update thirdparties logos to show them correctly in RTL mode 2023-11-16 12:19:39 +01:00
86484af409 Merge branch 'develop' into feature/my-documents-share 2023-11-15 15:44:20 +03:00
namushka
877b32d527 added error screen for form gallery 2023-11-13 18:29:33 +03:00
Akmal Isomadinov
36bb6da9ce Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
#	packages/client/src/store/FilesStore.js
2023-11-13 10:33:45 +05:00
2ea7ee368a Merge branch 'develop' into feature/management
# Conflicts:
#	frontend.code-workspace
2023-11-10 13:59:36 +04:00
8f22be679b Client:Plugins: change default plugin logo, fix path for assets at context menu and dd item 2023-11-10 11:39:17 +03:00
5be61afd7d Merge branch 'develop' into feature/my-documents-share 2023-11-09 19:05:58 +03:00
608b3b1260 Web: Files: fixed public-room icon 2023-11-09 18:46:46 +03:00
3170833b98 Merge branch 'develop' into feature/management
# Conflicts:
#	frontend.macos.code-workspace
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js
#	yarn.lock
2023-11-09 19:13:20 +05:00
d138608224 Web: change image 2023-11-08 11:16:00 +03:00
Akmal Isomadinov
50cf68375b Web:Navigation Fixed option icon 2023-11-07 14:11:18 +05:00
Akmal Isomadinov
8fd1f5d546 Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
#	packages/client/src/components/Badges.js
#	packages/client/src/components/EmptyContainer/EmptyFolderContainer.js
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/client/src/pages/Home/InfoPanel/Body/helpers/MembersHelper.js
#	packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js
#	packages/client/src/pages/Home/Section/Filter/index.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/SelectedFolderStore.js
2023-11-05 22:20:45 +05:00
248f0e80b2 Web: Added a mute icon in the room, added unmute when clicking on this icon. 2023-11-02 15:03:02 +03:00
f9dfc3954b Merge branch 'release/v2.0.0' into feature/new-form-gallery 2023-10-31 18:18:20 +04:00
c3cd684a0d Merge branch 'release/v2.0.0' into bugfix/icons 2023-10-30 18:34:09 +04:00
15547dedbb Fix Bug 64908 - Accounts: Profile. The flag of Saudi Arabia is incorrectly specified when selecting the language. 2023-10-30 18:27:23 +04:00
mushka-n
fed4bf3235 new empty info panel view + translation and styling fixes 2023-10-30 15:30:38 +03:00
0043f7e5e4 Merge branch 'develop' into feature/management 2023-10-27 21:41:10 +03:00
Akmal Isomadinov
561f7e6793 Web:settings: Fixed the icons of the settings 2023-10-27 18:39:46 +05:00
Akmal Isomadinov
2726113dc0 Web:Floating-Button Fixed icons and optimization 2023-10-26 18:51:31 +05:00
Akmal Isomadinov
5bd428ce16 Web:Modal: Fixed close icon 2023-10-26 17:33:16 +05:00