Commit Graph

638 Commits

Author SHA1 Message Date
f92072dad8 Web: Client: Fix flushSync error. Fix when data appears before loading skeleton 2024-02-15 16:12:12 +01:00
namushka
8cb5530457 fixed InfoPanel, Groups Table, People Table, Groups SelectionArea 2024-02-15 16:18:04 +03:00
17a12deedd
Merge pull request #266 from ONLYOFFICE/bugfix/article-error
Shared:Components:Article: return part of article body and delete use…
2024-02-15 16:30:07 +04:00
0987d0785f Shared:Components:Article: return part of article body and delete useless console log 2024-02-15 15:21:45 +03:00
4e14e52cfc Merge branch 'develop' into bugfix/rc-2.5.0 2024-02-15 16:05:41 +04:00
3339d7478a Shared: Components: ColorTheme: delete useless 2024-02-15 15:04:11 +03:00
4aaf55dcb0 Shared:Components:Article: add logs for detect 130 error and hide part of content 2024-02-15 14:10:48 +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
a15c8d3317 Web: Client: Fix when data appears before loading 2024-02-14 23:15:58 +01:00
e2521ff22a Merge branch 'develop' into feature/rewrite-recover-access-modal-dialog 2024-02-14 17:04:15 +04:00
6980f088bd Merge branch 'develop' into bugfix/my-documents-share 2024-02-14 16:29:35 +04:00
f208280cd8 Merge branch 'develop' into feature/rewrite-beta-badge 2024-02-14 16:23:25 +04:00
c5a24619dd Merge branch 'develop' into feature/rewrite-app-loader 2024-02-14 16:10:00 +04:00
c6a891b40e Merge branch 'develop' into feature/ads-banner 2024-02-14 15:05:19 +03:00
b151e17a25 Merge branch 'bugfix/rc-2.5.0' into develop 2024-02-14 15:40:16 +04:00
482cf79466 Merge branch 'develop' into feature/ads-banner 2024-02-14 14:29:59 +03:00
0d6ff55fb7 Web: Files: UploadPanel: fixed Minified React error #130 2024-02-14 14:29:03 +03: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
e909a104cb Web: ToggleButton: Refactoring. 2024-02-14 14:12:48 +03:00
Akmal Isomadinov
a00fe8cbf2 Merge branch 'develop' into feature/rewrite-recover-access-modal-dialog
# Conflicts:
#	packages/client/src/pages/PortalUnavailable/index.js
#	packages/login/src/client/components/Login.tsx
2024-02-14 16:03:20 +05:00
41711d21dd Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-14 13:59:55 +03:00
d47aa36c85 Merge branch 'develop' into bugfix/selectors 2024-02-14 13:57:36 +03:00
Akmal Isomadinov
e042f7c8eb Merge branch 'develop' into feature/rewrite-app-loader
# Conflicts:
#	packages/client/src/components/System/index.js
2024-02-14 15:41:23 +05: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
82bc9edd56 Shared: fix eslint errors 2024-02-14 11:04:06 +03:00
0fbc95a2ee Shared:Components:Scrollbar: fix after merge 2024-02-14 11:02:07 +03:00
e953fc7c04 Fix after merge 2024-02-14 11:01:43 +03:00
0c652ed1e5 Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-14 10:27:11 +03:00
76c6da472a Merge branch 'develop' into bugfix/selectors 2024-02-14 10:26:14 +03:00
Akmal Isomadinov
b8e83bb0fe Client: Fix provider order and refactoring 2024-02-14 12:21:57 +05:00
20887d0f4b Move some error translation keys to common 2024-02-14 02:27:50 +04:00
d8c2da7abf Merge branch 'develop' into feature/rewrite-error-boundary 2024-02-14 01:21:13 +04:00
904d828732 Web: Client: Add filters to People, Groups, InsideGroup (Accounts) 2024-02-13 21:48:47 +01:00
Akmal Isomadinov
faf3990959 Shared:Components:RecoverAccessModalDialog Rewrite and moved to shared 2024-02-14 00:39:02 +05:00
16cc8962ee Web: Shared: Adapt tabs to selector for people/groups 2024-02-13 16:21:08 +01:00
1fe703a0c9 Web: Shared: Adapt avatar for groups 2024-02-13 16:20:57 +01:00
05739c17b3 Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-13 14:49:46 +03: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
cd321af411 Fix after merge 2024-02-13 13:48:15 +03:00
6ff443de9a Merge branch 'develop' into bugfix/my-documents-share 2024-02-13 13:08:28 +03:00
Akmal Isomadinov
3cb31f417a Merge branch 'develop' into feature/rewrite-error-boundary 2024-02-13 14:28:52 +05:00
233f936876 Merge branch 'bugfix/selectors' of github.com:ONLYOFFICE/DocSpace-client into bugfix/selectors 2024-02-13 12:17:15 +03:00
Akmal Isomadinov
55adeea6c1 Merge branch 'develop' into feature/rewrite-app-loader
# Conflicts:
#	packages/client/src/pages/Sdk/index.js
2024-02-13 14:13:51 +05:00
10b382d88d Fix after merge 2024-02-13 12:11:33 +03:00
Akmal Isomadinov
f9902d95fc Shared:Components:BetaBadge Rewrite and moved to shared 2024-02-13 14:05:47 +05:00
ccce651266 Merge branch 'develop' into bugfix/selectors 2024-02-13 11:05:39 +03:00
695c899b32 Shared:Components:Share: move from client and rewrite to typescript 2024-02-13 10:10:31 +03:00
Akmal Isomadinov
2084477720 Shared:Components:MoreLoginModal Rewrite and moved to shared 2024-02-13 11:27:26 +05:00
9761a340f5 Move many translation keys to Common 2024-02-13 04:42:10 +04:00
ca200878d9 Merge branch 'develop' into feature/js-sdk-presets 2024-02-12 20:21:07 +04:00
Akmal Isomadinov
10bb0b6fc4 Shared:Components:AppLoader: Rewrite to typescript 2024-02-12 17:49:29 +05:00
Akmal Isomadinov
e933e911ba AppLoader moved from common to shared 2024-02-12 16:41:00 +05:00
ed3ec48e2a Merge branch 'develop' into feature/ads-banner 2024-02-12 13:38:41 +03:00
399d4604ea Merge branch 'develop' into feature/editor-nextjs 2024-02-12 12:39:10 +03:00
3526d327fa Merge branch 'develop' into bugfix/selectors 2024-02-12 10:01:30 +03:00
66b311743d Shared: Filter: return sort button for recent 2024-02-11 20:30:16 +03:00
88b0184a08 Merge branch 'develop' into bugfix/my-documents-share 2024-02-10 00:46:50 +03:00
d997ce3eb6 Shared: LinkWithDropdown: fix style 2024-02-10 00:40:59 +03:00
d40ca0bb97 Merge branch 'develop' into bugfix/calendar 2024-02-09 19:25:48 +04:00
Vladimir Khvan
137207b78b Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
	packages/shared/selectors/Room/RoomSelector.types.ts
	packages/shared/selectors/Room/index.tsx
2024-02-09 20:24:06 +05:00
4743a9b0f2 Merge branch 'develop' into bugfix/selectors 2024-02-09 17:37:53 +03:00
678c6f22fe Selectors: fix search 2024-02-09 17:23:08 +03:00
b57da7b8d4 Merge branch 'develop' into feature/invite-panel-input 2024-02-09 18:16:55 +04:00
d0c3d6be6d
Merge pull request #246 from ONLYOFFICE/bugfix/table-resize
Web: Components: Table: fixed resize
2024-02-09 18:15:13 +04:00
d9b026c166 Merge branch 'develop' into feature/invite-panel-input
# Conflicts:
#	packages/client/src/components/panels/InvitePanel/sub-components/InviteInput.js
#	packages/client/src/components/panels/InvitePanel/sub-components/Item.js
2024-02-09 17:11:02 +03:00
Vladimir Khvan
528fdae2f5 Web: Client: Component: minDate, maxDate and initialDate issues were fixed 2024-02-09 18:35:22 +05:00
5fa8ebe810 Web: Components: Table: fixed resize 2024-02-09 16:28:16 +03:00
c42cc9587d Merge branch 'develop' into bugfix/selectors 2024-02-09 14:37:25 +03:00
94625cdf3f Shared:Components:Selector: fix footer visible 2024-02-09 14:37:20 +03:00
Akmal Isomadinov
84a0bde5a2 Removed useless code 2024-02-09 15:52:02 +05:00
Akmal Isomadinov
1c95617184 Shared:Components:ErrorBoundary Added missing props 2024-02-09 15:51:04 +05:00
e46207cf8b Shared:Selectors:Files: init, fix usage, rewrite to typescript additional components 2024-02-09 12:28:10 +03:00
Akmal Isomadinov
d610ab622a Shared:Components:Errors Rewrite to typescript 2024-02-09 14:26:00 +05:00
Akmal Isomadinov
4541d4cdfa Shared:Components:ReportDialog Rewrite to typescript 2024-02-09 14:07:14 +05:00
f033ccc0bf Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop 2024-02-09 13:16:59 +05:00
2de9f21957 Web: corrected the user type in members, invite panel and selector 2024-02-09 13:16:48 +05:00
80a3112948
Merge pull request #238 from ONLYOFFICE/bugfix/66280
bugfix/66280
2024-02-09 01:23:26 +04:00
a6aa08bbb6 Merge branch 'develop' into bugfix/my-documents-share 2024-02-08 21:08:52 +03:00
f48c689a30 Shared:Selectors:People: fix types, refactoring, fix usage 2024-02-08 19:26:40 +03:00
Akmal Isomadinov
7b0bd540a3 ReportDialog moved from client to shared 2024-02-08 20:49:31 +05:00
Akmal Isomadinov
17eec03a84 DocspaceLogo Rewrite to typescript 2024-02-08 20:35:53 +05:00
8d1ed918d7 Shared:Selectors:Room: fix types, refactoring, fix usage 2024-02-08 18:15:35 +03:00
58655cbe9c Merge branch 'develop' into feature/invite-panel-input 2024-02-08 18:58:29 +04:00
cff9066645 Fix confirm invite (password settings issue) 2024-02-08 18:57:31 +04:00
1d2d6d42eb Web: Components: Calendar: fix 2024-02-08 15:24:31 +03:00
253d82b929 Shared:Components:Selector: update types for union 2024-02-08 15:11:07 +03:00
Vladimir Khvan
eaeb000378 Web: Client: JavascriptSDK: fixed height setting (in percents) / added skeleton in code section 2024-02-08 16:39:39 +05:00
5bdd44ab8b Web: Components: fixed Calendar, DatePicker components after rewriting into typescript 2024-02-08 14:38:49 +03:00
Akmal Isomadinov
8e51248969 Shared:Components:ErrorContainer Updated stories 2024-02-08 16:30:11 +05:00
Akmal Isomadinov
44610c20e3 Shared:Components:ErrorContainer Rewrite to typescript 2024-02-08 16:27:25 +05:00
f80c9d6610 Merge branch 'develop' into feature/invite-panel-input 2024-02-08 15:12:43 +04:00
902363529b
Merge pull request #239 from ONLYOFFICE/bugfix/image-editor
Bugfix/image editor
2024-02-08 15:04:55 +04:00
3aed1f74f4 Fix display InfoPanel button (design issue) 2024-02-08 15:02:18 +04:00
Akmal Isomadinov
1b585e3aac Shared:Components:Headline Rewrite to typescript 2024-02-08 15:46:31 +05:00
f23916268d Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop 2024-02-08 15:40:12 +05:00
943f0944de Shared:Components:RoomIcon: fix types 2024-02-08 12:55:47 +03:00
570d105863 Fixed Bug 66280 - Files. The Sort by button icon is separately highlighted when hovered. 2024-02-08 14:09:57 +05:00
Akmal Isomadinov
797b37a6f9 ErrorContainer moved from common to shared 2024-02-08 12:58:38 +05:00
Akmal Isomadinov
4c2cfce25e Errors moved from client to shared 2024-02-08 12:48:02 +05:00
8bf5420706 Shared:Components:PublicRoomBar: delete useless 2024-02-08 09:51:09 +03:00
8409a6cee7 Merge branch 'develop' into feature/invite-panel-input 2024-02-07 19:33:11 +04:00
fd742f5602 Shared:Components:PublicRoomBar: move from client 2024-02-07 17:42:03 +03:00
0111dd2ebc Doceditor:SelectFileDialog: init 2024-02-07 15:59:08 +03:00
d33a1224af Shared:Components:RoomIcon: fix base theme color 2024-02-07 15:21:20 +03:00
6e232e2bd4 Web: Components: fixed AccessRightSelect 2024-02-07 14:39:35 +03:00
Akmal Isomadinov
008fb72328 Shared:Components:ErrorBoundary Rewritten to typescript 2024-02-07 15:38:43 +05:00
Akmal Isomadinov
a509ef0332 ErrorBoundary moved from common to shared 2024-02-07 14:44:26 +05:00
bd6b48f68f Shared:Components:RoomIcon: fix load image 2024-02-07 12:37:47 +03:00
92e2adaa2f Merge branch 'develop' into feature/ads-banner 2024-02-06 21:55:59 +03:00
bd96af8c1d
Merge pull request #215 from ONLYOFFICE/feature/refactoring-media-viewer
Feature/refactoring media viewer
2024-02-06 21:54:08 +04:00
Akmal Isomadinov
2ad2e0dfcd Shared:Components:MediaViewer: Fixed import/export 2024-02-06 20:42:15 +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
33b32c21a5 Merge branch 'develop' into feature/js-sdk-presets 2024-02-06 13:27:38 +05:00
bdc164ca25
Merge pull request #223 from ONLYOFFICE/bugfix/context-menu-button
bugfix/context-menu-button
2024-02-06 02:49:58 +04:00
cbf70fd432 the fix has been shortened 2024-02-05 18:24:59 +05:00
72be9e6da7 Merge branch 'develop' into feature/refactoring-media-viewer
# Conflicts:
#	packages/shared/package.json
2024-02-05 17:21:59 +04:00
3d1d1f2e29 Web: Shard: Components: ImageEditor: corrected the step in the call 2024-02-05 18:20:00 +05:00
8679a0a529 Web: Shared: Components: ImageEditor: fixed a problem where large images might not load 2024-02-05 18:14:29 +05:00
ca55be18a5 Shared:Components:IconButton: remove icon button 2024-02-05 16:06:57 +03:00
27bf9c7202 Shared:Components:Scrollbar: remove throw error 2024-02-05 15:56:38 +03:00
b6b8777437 Merge branch 'feature/custom-scrollbar' into feature/editor-nextjs 2024-02-05 14:55:43 +03:00
84a0128912 Shared:Components:Scrollbar: fix custom scrollbar storybook 2024-02-05 14:20:42 +03:00
0f5b73a9b5 Shared: move custom-scrollbar from utils to scrollbar component 2024-02-05 13:49:14 +03:00
de6fe7e649 Merge branch 'develop' into bugfix/my-documents-share 2024-02-05 13:26:30 +03:00
000b1fa6cd Shared:Utils:Scrollbar: fix using from library to utils 2024-02-05 13:21:48 +03:00
fd3d07ebe5 Shared: fix ts problems 2024-02-05 12:56:29 +03:00
Akmal Isomadinov
251de059f4 Merge branch 'develop' into feature/refactoring-media-viewer 2024-02-05 14:31:47 +05:00
Akmal Isomadinov
c19fd9d297 MediaViewer: Updated stories 2024-02-05 14:10:06 +05:00
Akmal Isomadinov
980f13aa7f MediaViewer:Player Fix 2024-02-05 13:47:58 +05:00
Akmal Isomadinov
8c056f5907 MediaViewer:Player Added load progress 2024-02-05 13:29:56 +05:00
2e6d4252e2 fixed page crashing when clicked clickOutsideAction 2024-02-05 12:13:19 +05:00
bb1a43bf67 Merge branch 'develop' into feature/editor-nextjs 2024-02-05 10:12:51 +03:00
Akmal Isomadinov
755e2386ce MediaViewer: Fixed memory leak tiff 2024-02-04 21:26:29 +05:00
Akmal Isomadinov
b0a792f3d7 MediaViewer: Optimization of tiff decoding 2024-02-04 19:08:01 +05:00
Akmal Isomadinov
73379d43d6 MediaViewer: Updated README.md 2024-02-02 20:27:48 +05:00
Akmal Isomadinov
7c09046880 MediaViewer: Added description 2024-02-02 20:27:23 +05:00
efd9363ffd Merge branch 'develop' into feature/ads-banner 2024-02-02 18:26:47 +03:00
97cdf17362 Shared: Navigation: fix 2024-02-02 18:22:42 +03:00
Akmal Isomadinov
01927114cd MediaViewer: Added stories 2024-02-02 18:48:07 +05:00
Akmal Isomadinov
29e4418b3e MediaViewer: Fixed export 2024-02-02 18:47:33 +05:00
4787d59828 Shared: CampaignsBanner: fix 2024-02-02 15:38:04 +03:00
436e17481b Shared: CampaignsBanner: fix test 2024-02-02 15:33:28 +03:00
e0dd4c0848 Shared: CampaignsBanner: fix stories 2024-02-02 15:31:01 +03:00
f9bbf35e40 Merge branch 'develop' into feature/ads-banner 2024-02-02 14:38:53 +03:00
5823c18b73 Shared: Navigation: fix trash warning position 2024-02-02 14:35:43 +03:00
89c210a4f7 Shared: fix nextjs problems 2024-02-02 14:30:57 +03:00
b7ed472dae Web: Files: Navigation: fixed header-menu width 2024-02-02 13:49:28 +03:00
338b3eca62 Web: Files: Fixed navigation styles for public room 2024-02-02 13:27:28 +03:00
Akmal Isomadinov
b4fc13d045 Renamed to media-viewer 2024-02-02 12:46:42 +05:00
Vladimir Khvan
2bfd15a162 Merge branch 'develop' into feature/js-sdk-presets 2024-02-02 12:40:49 +05:00
Akmal Isomadinov
cb6b4d0a57 Merge branch 'develop' into feature/refactoring-media-viewer
# Conflicts:
#	packages/common/components/MediaViewer/sub-components/Viewer/index.tsx
2024-02-02 12:25:09 +05:00
51344b6dc5 Merge branch 'feature/refactoring-selectors' into feature/editor-nextjs 2024-02-02 10:12:40 +03:00
412bfd7562 Merge branch 'feature/rewrite-stores' into feature/refactoring-selectors 2024-02-02 10:07:56 +03:00
ebff35be27 Shared: fix after merge 2024-02-01 23:29:29 +03:00
6cec06c4c3 Merge branch 'develop' into feature/ads-banner 2024-02-01 23:24:34 +03:00
Akmal Isomadinov
ee666a6fad MediaViewer: Removed dependence on store 2024-02-01 19:25:01 +05:00
01aa67f360 Shared:Components: fix eslint problems 2024-02-01 17:10:37 +03:00
51ce81a903 Shared: CampaignsBanner: fix types 2024-02-01 15:34:11 +03:00
Akmal Isomadinov
101cdf8cd6 Shared:Components:MediaViewer Refactoring types 2024-02-01 17:14:33 +05:00
015899ec1d Shared: Article: delete useless 2024-02-01 14:56:10 +03:00
ba886fbdcd Merge branch 'develop' into feature/ads-banner 2024-02-01 14:39:48 +03:00
Akmal Isomadinov
b3558f0f66 Shared:Components:MediaViewer:Player Fixed visible controls 2024-02-01 16:23:09 +05:00
767376c37c Merge branch 'develop' into feature/refactoring-auth-store 2024-02-01 13:53:52 +03:00
Vladimir Khvan
cdcffc31c9 Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
	packages/client/src/pages/Home/Section/Header/index.js
	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/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 15:01:55 +05:00
82a720b16b Merge branch 'develop' into feature/public-room 2024-02-01 13:59:48 +04:00
2045f066c5 Merge branch 'feature/refactoring-selectors' into feature/editor-nextjs 2024-02-01 12:57:50 +03:00
4cd6253378 Merge branch 'feature/rewrite-stores' into feature/refactoring-selectors 2024-02-01 12:56:28 +03:00
b40b37018d Merge branch 'develop' into feature/refactoring-auth-store 2024-02-01 12:54:43 +03:00
Akmal Isomadinov
93000a6ab0 Shared:Components:MediaViewer:Player Fixed flashing of the audio icon when opening the player 2024-02-01 14:47:50 +05:00
Akmal Isomadinov
341dd8bbb2 Shared:Components:MediaViewer: Fixed style code 2024-02-01 14:18:06 +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
e4339f721f Merge branch 'develop' into feature/list-accounts-additional-info 2024-02-01 12:50:35 +05:00
Akmal Isomadinov
4440677bbf Merge branch 'develop' into feature/refactoring-media-viewer 2024-02-01 12:45:59 +05:00
9e632fc139 Shared:Components:Selector: fix default theme 2024-02-01 10:17:58 +03:00
3362ad49fe Merge branch 'develop' into feature/ads-banner 2024-02-01 00:33:50 +03:00
91165250d6 Merge branch 'develop' into feature/new-tariff-bar 2024-01-31 21:01:07 +04:00
Akmal Isomadinov
0b58025361 Removed script tiff.min 2024-01-31 21:28:47 +05:00
Akmal Isomadinov
7ff2e88d3d Shared:Components:MediaViewer: Optimization of working with tiff images 2024-01-31 21:16:23 +05:00
fd0a30d057 Merge branch 'develop' into feature/list-accounts-additional-info
# Conflicts:
#	packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js
2024-01-31 19:59:18 +05:00
b64e8dd7d0 Shared:Components:RadioButtonGroup: fix number value 2024-01-31 15:12:14 +03:00
Akmal Isomadinov
8abb9a6b48 Shared:Components:MediaViewer: fixed close media viewer 2024-01-31 16:15:45 +05:00
c35affc3a0 Shared: CampaignsBanner: add onClose, onAction, action type 2024-01-31 13:41:57 +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
8953ae954f Shared:Components:Selector: fix bread crumbs click 2024-01-31 11:21:23 +03:00
Vladimir Khvan
f3f6f981ca Web: Shared: heightTextArea was cast to union of string and number | error indication was fixed 2024-01-31 12:48:23 +05:00
e6d8e143ae Shared: CampaignsBanner: init new banner 2024-01-31 01:55:22 +03:00
94eaa55676 Merge branch 'feature/rewrite-stores' into feature/refactoring-selectors 2024-01-30 17:53:18 +03:00
79d2861d1a Shared:Selectors:Files: move from client 2024-01-30 17:39:36 +03:00
Akmal Isomadinov
b46be1f763 Shared:Components:MediaViewer: Removed stories 2024-01-30 19:14:07 +05:00
Akmal Isomadinov
51bc166be8 Shared:Components:MediaViewer: Fixed timeline and styles 2024-01-30 19:13:42 +05:00
Akmal Isomadinov
355ff63549 Shared:Components:PDFViewer Refactoring, optimization and fixed types 2024-01-30 16:26:23 +05: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
Akmal Isomadinov
7b1a5fa4ee Merge branch 'develop' into feature/refactoring-media-viewer 2024-01-30 14:38:50 +05:00
Akmal Isomadinov
547a65be41 Shared:Components:MediaViewer:Player Refactoring, optimization and fixed types 2024-01-30 14:37:05 +05:00
7a548bd571 Merge branch 'develop' into feature/new-tariff-bar 2024-01-30 12:13:15 +03:00
Vladimir Khvan
d9e7652f9e Web: heightTextArea was changed to string 2024-01-30 13:54:49 +05:00
cad2686988 Web: Files: fixed RoomIcon 2024-01-30 11:28:38 +03:00
Vladimir Khvan
2e70879a95 Web: Components: textarea: heightTextArea prop was cast to string
Conflicts:
	packages/components/textarea/textarea.stories.js
	packages/shared/components/textarea/README.md
	packages/shared/components/textarea/Textarea.styled.tsx
	packages/shared/components/textarea/Textarea.tsx
2024-01-30 13:19:50 +05:00
153ce3749c Shared:Selectors:Room: fix types 2024-01-30 11:09:00 +03:00