IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,289 Commits 40 Branches 22 Tags 420 MiB
82cd218289
Commit Graph

580 Commits

Author SHA1 Message Date
Alexey Safronov
bb0267fe55 Merge branch 'hotfix/v2.5.1' into develop 
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
 2024-04-23 10:30:01 +04: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
Vladimir Khvan
630f9d79ad Web: CLient: JavascriptSDK: dark mode tooltips's images were added for file selector preset 2024-04-22 18:15:12 +05:00
Alexey Safronov
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
Alexey Safronov
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
gazizova-vlada
0bace3efe2 Icons:Replaced the storage management icon in the menu. 2024-04-19 12:03:40 +03: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
abea7a8655 Client:Components:EmptyContainer Added upload action 2024-04-17 16:55:18 +05:00
Alexey Safronov
49cb4789f9 Enabled new language sr-Latn-RS 2024-04-16 13:02:44 +04:00
Alexey Safronov
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
Aleksandr Lushkin
159eff6bbe Client: Shared: Selectors: Groups: Add 75px empty screen images for groups selector 2024-04-12 10:34:32 +02:00
Aleksandr Lushkin
2c224e00d0 Client: Shared: Selectors: Groups: Fix empty screen images 2024-04-12 10:25:19 +02: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
Akmal Isomadinov
94115667df Client:Components:EmptyView Update empty icon 2024-04-08 17:58:14 +05:00
Alexey Safronov
76c29e1335 Merge branch 'develop' into feature/form-room-modals 2024-04-08 01:39:14 +04:00
Alexey Safronov
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
Ilya Oleshko
7e32763dff Merge branch 'release/v2.5.0' into feature/logo-handler 2024-04-05 15:54:34 +03:00
gopienkonikita
7671855f14 Web: Files: Public: fixed styles 2024-04-05 14:03:44 +03:00
Alexey Safronov
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
Ilya Oleshko
9b5a62ee24 Merge branch 'release/v2.5.0' into feature/logo-handler 2024-04-04 10:06:33 +03:00
Elyor Djalilov
40df0fe348 Web: Client: Groups. fixed empty screen svg 2024-04-03 18:10:33 +05:00
Ilya Oleshko
c847ef1545 Merge branch 'release/v2.5.0' into feature/logo-handler 2024-04-03 09:55:06 +03:00
Viktor Fomin
d3f226f48a Shared: Tag: delete useless 2024-04-02 16:30:45 +03:00
Ilya Oleshko
fcd18f0742 Client: Logo from handler 2024-04-02 08:25:21 +03:00
Akmal Isomadinov
22002269ab Client:Dialog: Added CreatedPDFFormDialog 2024-03-28 17:04:16 +05:00
Alexey Safronov
09bdc7e382 Merge branch 'release/v2.5.0' into develop 2024-03-26 14:38:57 +04:00
Vladimir Khvan
11189a341a Web: Client: JavascriptSDK: hint images for options in dark mode were corrected 2024-03-26 14:35:06 +05:00
Alexey Safronov
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
Alexey Safronov
adcc11094d Copyright 2024 2024-03-18 03:13:02 +04:00
Alexey Safronov
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
Alexey Safronov
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
fe26a57c41 Merge branch 'develop' into feature/redesign-form-filling-room 2024-03-06 16:29:27 +05:00
Elyor Djalilov
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
Alexey Safronov
84fc187a27 Merge branch 'develop' into feature/groups 2024-03-04 21:55:21 +04:00
Alexey Safronov
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
Alexey Safronov
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
Alexey Safronov
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
DmitrySychugov
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
Alexey Safronov
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
Aleksandr Lushkin
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
Alexey Safronov
15ddf95e3b Merge branch 'develop' into feature/invite-page-redesign 2024-02-26 20:49:56 +04:00
Elyor Djalilov
bfc6767c02 renamed form gallery error image 2024-02-26 20:24:30 +05:00
Elyor Djalilov
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
Tatiana Lopaeva
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
Tatiana Lopaeva
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
Timofey Boyko
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
Aleksandr Lushkin
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
Tatiana Lopaeva
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
Aleksandr Lushkin
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
Timofey Boyko
c346033713 Merge branch 'develop' into feature/oauth2-client 2024-02-07 10:20:15 +03:00
Tatiana Lopaeva
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
gopienkonikita
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
Alexey Safronov
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
gopienkonikita
56c71f61af Web: Files: Public-room: fixed icon 2024-01-30 14:03:50 +03:00
gopienkonikita
4364f20f6a Web: Files: added public badge 2024-01-30 13:05:17 +03:00
gopienkonikita
c1d0bb9995 Web: Files: Public-room: fixed links row 2024-01-30 11:05:54 +03:00
Ilya Oleshko
230b8cdd7a Merge branch 'hotfix/v2.0.2' into feature/js-sdk-loader 2024-01-29 21:46:15 +03:00
Ilya Oleshko
de24cb3330 Images: Loader: Fixed js-sdk loader 2024-01-29 21:41:29 +03:00
Alexey Safronov
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
gopienkonikita
efeb9be315 Web: Files: Public-room: added navigation button, added new icons 2024-01-29 17:55:55 +03:00
Alexey Safronov
a1fc8864b0 Editor: added new favicon for PDF files 2024-01-29 15:48:57 +04:00
Tatiana Lopaeva
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
Ilya Oleshko
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
Tatiana Lopaeva
8811ec7fbd Web: Changed svg. 2024-01-23 11:42:09 +03:00
Timofey Boyko
740996ca7e Merge branch 'develop' into feature/oauth2-client 2024-01-22 10:11:13 +03:00
Alexey Safronov
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
Alexey Safronov
968573ce02 Merge branch 'hotfix/v2.0.1' into develop 
# Conflicts:
#	packages/components/toast/styled-toastr.js
 2024-01-19 16:20:16 +04:00
Tatiana Lopaeva
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
Viktor Fomin
825c765b7d Merge branch 'develop' into feature/my-documents-share 2024-01-18 20:38:44 +03:00
Ilya Oleshko
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
Tatiana Lopaeva
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