Viktor Fomin
|
9124709643
|
Merge branch 'develop' into bugfix/Bug61132
|
2023-02-20 17:19:51 +03:00 |
|
Viktor Fomin
|
ab2f8aae6b
|
Client: InfoPanel: use dark images
|
2023-02-20 17:19:44 +03:00 |
|
|
7a5b5e3e12
|
Web: Files: added multi-file upload
|
2023-02-20 17:08:37 +03:00 |
|
DmitrySychugov
|
f829931b5a
|
Merge branch 'develop' into bugfix/fixed-dbclick-zoom
|
2023-02-20 16:27:57 +05:00 |
|
DmitrySychugov
|
75fbfa1fcf
|
Merge branch 'develop' into bugfix/fixed-dbclick-zoom
|
2023-02-20 14:56:31 +05:00 |
|
|
b41c926279
|
Web: Files: fixed duplicate files when uploading and resizing at the same time
|
2023-02-20 12:49:30 +03:00 |
|
|
e98cfda6b6
|
Merge branch 'develop' into feature/refactoring-viewer
|
2023-02-20 12:05:33 +04:00 |
|
Akmal Isomadinov
|
c525cb3d5e
|
Web:Common:Components:MediaViewer:Helpers Fixed isSeparator type guard
|
2023-02-20 12:39:01 +05:00 |
|
|
bfa214906c
|
Merge pull request #1219 from ONLYOFFICE/bugfix/user-info-displaying
Fixed Bug 61107 - Web: Client: added bufferSelection
|
2023-02-20 10:27:04 +03:00 |
|
|
fcf2cfb2a6
|
Merge pull request #1221 from ONLYOFFICE/feature/fix-long-name
Web:Client:Adding an ellipsis to a long name in the info panel, addin…
|
2023-02-20 10:23:57 +03:00 |
|
|
3b17663884
|
Web:Client: Add prop truncate.
|
2023-02-20 10:19:40 +03:00 |
|
Akmal Isomadinov
|
e674e4414d
|
Web:Common:Components:MediaViewer:Sub-Components:Viewer Refactoring
|
2023-02-20 11:50:18 +05:00 |
|
|
46a839a184
|
Merge pull request #1216 from ONLYOFFICE/bugfix/fix-room-into-room
Bugfix/fix room into room
|
2023-02-20 09:10:52 +03:00 |
|
Viktor Fomin
|
2483ed2523
|
Merge branch 'develop' into bugfix/Bug61132
|
2023-02-18 23:58:12 +03:00 |
|
Viktor Fomin
|
6745936010
|
Client: PortalSettings: delete useless
|
2023-02-18 23:58:05 +03:00 |
|
Viktor Fomin
|
da64a10897
|
Client: AccountsHome: EmptyScreen: use dark images
|
2023-02-18 23:57:14 +03:00 |
|
Viktor Fomin
|
5676a8fadd
|
Client: Components: EmptyContainer: use dark images
|
2023-02-18 23:56:47 +03:00 |
|
Viktor Fomin
|
1d8b66b152
|
Client: Components: BreakpointWarning: use dark images
|
2023-02-18 23:56:23 +03:00 |
|
Akmal Isomadinov
|
e810217b42
|
Web:Common:Components:MediaViewer:Sub-Components: Removed old unnecessary components
|
2023-02-18 23:37:37 +05:00 |
|
Akmal Isomadinov
|
bcfef89ef1
|
Web:Common:Components:MediaViewer:Sub-Components: Changed to a new viewer component
|
2023-02-18 23:34:55 +05:00 |
|
Akmal Isomadinov
|
8762efde2c
|
Web:Common:Components:MediaViewer:Sub-Components: Added Viewer component
|
2023-02-18 23:30:20 +05:00 |
|
Akmal Isomadinov
|
1f499d6795
|
Web:Components:Viewer:Sub-Components Moved the global state to the local state in the viewer-player component
|
2023-02-18 23:26:54 +05:00 |
|
Akmal Isomadinov
|
30a842dec7
|
Web:Common:Components:MediaViewer:Sub-Components Added PrevButton component
|
2023-02-18 23:11:15 +05:00 |
|
Akmal Isomadinov
|
5b9e3e28e4
|
Web:Common:Components:MediaViewer:Sub-Components Added NextButton component
|
2023-02-18 23:09:50 +05:00 |
|
Akmal Isomadinov
|
8f38037b01
|
Web:Common:Components:MediaViewer:Sub-Components: Added MobileDetails component
|
2023-02-18 23:08:01 +05:00 |
|
Akmal Isomadinov
|
0792f45aef
|
Web:Common:Components:MediaViewer:StyledComponents: Added entry point index.ts
|
2023-02-18 23:05:31 +05:00 |
|
Akmal Isomadinov
|
d9da80902f
|
Web:Common:Components:MediaViewer:StyledComponents: Added component StyledViewerContainer
|
2023-02-18 23:03:19 +05:00 |
|
Akmal Isomadinov
|
78c159387c
|
Web:Common:Components:MediaViewer:StyledComponents: Added component StyledSwitchToolbar
|
2023-02-18 23:02:41 +05:00 |
|
Akmal Isomadinov
|
f34f49d570
|
Web:Common:Components:MediaViewer:StyledComponents: Added component StyledMobileDetails
|
2023-02-18 23:01:59 +05:00 |
|
Akmal Isomadinov
|
3b17f4b55f
|
Web:Common:Components:MediaViewer:StyledComponents: Added component StyledButtonScroll
|
2023-02-18 23:00:47 +05:00 |
|
Akmal Isomadinov
|
e6273f374d
|
Web:Common:Components:MediaViewer:StyledComponents: Added component ControlBtn
|
2023-02-18 22:59:16 +05:00 |
|
DmitrySychugov
|
afa08fd798
|
Web: Components: fixed zoom by double clicking
|
2023-02-17 20:08:50 +05:00 |
|
|
b1aaa20baf
|
Web:Client:Adding an ellipsis to a long name in the info panel, adding the width of the name block as a percentage.
|
2023-02-17 16:07:28 +03:00 |
|
Timofey Boyko
|
57f86dd447
|
Web:Common:MediaViewer: change isMobileOnly on isMobile
|
2023-02-17 15:57:09 +03:00 |
|
Timofey Boyko
|
515a87d818
|
Web:Component:Viewer: add touch events for table devices
|
2023-02-17 15:56:49 +03:00 |
|
|
e3132d1e2c
|
Web: Files: fixed setSelections
|
2023-02-17 15:05:35 +03:00 |
|
|
4ba51c1779
|
Web: GlobalEvents: Added saving changes using a hotkey.
|
2023-02-17 15:02:01 +03:00 |
|
|
3ac15f3af2
|
Fixed Bug 61245 - Rooms.Hotkeys.Closing the 'Change user type' panel by Esc does not work.
|
2023-02-17 14:53:14 +03:00 |
|
DmitrySychugov
|
3dc1e045a0
|
Fixed Bug 61107 - Web: Client: added bufferSelection
|
2023-02-17 16:42:56 +05:00 |
|
Timofey Boyko
|
774ef40670
|
Web:Components:Viewer: fix touch events at iphone
|
2023-02-17 14:41:22 +03:00 |
|
Timofey Boyko
|
f985d1c8bb
|
Web:Components:Viewer: delete useless code
|
2023-02-17 14:39:40 +03:00 |
|
Timofey Boyko
|
783cfe957b
|
Web:Components:Viewer: fix touch events at iphone
|
2023-02-17 14:37:54 +03:00 |
|
Timofey Boyko
|
bfc974e8ca
|
Merge branch 'bugfix/fix-room-into-room' of https://github.com/ONLYOFFICE/DocSpace into bugfix/fix-room-into-room
|
2023-02-16 16:32:01 +03:00 |
|
Timofey Boyko
|
66cc40953d
|
Web:Client: fix create room socket event for second window
|
2023-02-16 16:31:53 +03:00 |
|
|
b0eaabaa5d
|
Merge branch 'develop' into bugfix/fix-room-into-room
|
2023-02-16 15:36:01 +03:00 |
|
Timofey Boyko
|
af74503480
|
Web:Client: fix displaying room into rooms
|
2023-02-16 15:12:07 +03:00 |
|
|
e8fcafa4db
|
Merge branch 'develop' into bugifx/Bug61098
|
2023-02-16 13:46:24 +03:00 |
|
Mushka Nikita
|
c366b5ef0b
|
fixed getDaysRemaining method
|
2023-02-16 13:06:40 +03:00 |
|
Mushka Nikita
|
8e0751922e
|
revert roomCell removed span tag
|
2023-02-16 12:06:09 +03:00 |
|
Mushka Nikita
|
03f3f71b7a
|
Merge branch 'feature/entries-trash-origin' of github.com:ONLYOFFICE/AppServer into feature/entries-trash-origin
|
2023-02-16 12:02:46 +03:00 |
|
Mushka Nikita
|
627a6b7f2a
|
reordered trash table columns and separated Author, Created, Size and Type trash table columns for default isEnable
|
2023-02-16 12:02:41 +03:00 |
|
|
f8f33c3574
|
Web: Added api error handling
|
2023-02-16 11:20:48 +03:00 |
|
Viktor Fomin
|
569bd443fc
|
Fix Bug 61098: android scroll on settings page
|
2023-02-16 01:03:24 +03:00 |
|
Timofey Boyko
|
17fd03c0b2
|
Web:Client:Home: fix memory leak for tile
|
2023-02-15 18:24:12 +03:00 |
|
|
f738a8b830
|
Merge branch 'develop' into feature/entries-trash-origin
|
2023-02-15 17:29:23 +03:00 |
|
Mushka Nikita
|
98c9f72dfe
|
removed unused file
|
2023-02-15 15:18:48 +03:00 |
|
Mushka Nikita
|
d807ec5d7a
|
reverted erasure sorting to DateAndTime
|
2023-02-15 15:18:37 +03:00 |
|
Mushka Nikita
|
d0354b931a
|
fixed tooltip missing onUpdate rebuild
|
2023-02-15 14:32:19 +03:00 |
|
Timofey Boyko
|
db7e9ec322
|
Merge branch 'develop' into bugfix/Bug-61190
|
2023-02-15 12:23:25 +03:00 |
|
|
f48b2b040e
|
Merge pull request #1204 from ONLYOFFICE/bugfix/login-confirm-style
Bugfix/login confirm style
|
2023-02-15 12:16:36 +03:00 |
|
Timofey Boyko
|
93d1675bfb
|
Fixed Bug 61190 - Files. The editor does not open + errors in the console if the username contains XSS injection
|
2023-02-15 12:16:11 +03:00 |
|
Viktor Fomin
|
d0db109aa7
|
Client: Confirm: fix toast
|
2023-02-15 12:04:33 +03:00 |
|
Viktor Fomin
|
938414c56b
|
Client: Confirm: fix
|
2023-02-15 11:52:34 +03:00 |
|
Viktor Fomin
|
0755ebc597
|
Common: add query for get settings with password
|
2023-02-15 11:52:19 +03:00 |
|
|
a09de96338
|
Merge pull request #1212 from ONLYOFFICE/bugfix/spam-media-removal
Web: Common: fixed the ability to spam deleting a media file with hotkey
|
2023-02-15 11:14:46 +03:00 |
|
DmitrySychugov
|
9a154409be
|
Merge branch 'develop' into bugfix/spam-media-removal
|
2023-02-15 13:10:32 +05:00 |
|
DmitrySychugov
|
6276b768f4
|
Merge branch 'bugfix/spam-media-removal' of github.com:ONLYOFFICE/DocSpace into bugfix/spam-media-removal
|
2023-02-15 13:10:24 +05:00 |
|
DmitrySychugov
|
43e9f8ea17
|
Web: Common: rename isRemoved to lastRemovedFileId
|
2023-02-15 13:09:36 +05:00 |
|
|
de3bcd698e
|
Merge branch 'develop' into bugfix/fix-desktop-navigation
|
2023-02-15 11:06:08 +03:00 |
|
Mushka Nikita
|
c6b835166f
|
disabled erasure warning in empty trash case
|
2023-02-14 23:39:38 +03:00 |
|
Mushka Nikita
|
d0fb62615d
|
added tooltip
|
2023-02-14 23:38:57 +03:00 |
|
Viktor Fomin
|
96e63bf056
|
Merge branch 'develop' into bugfix/login-confirm-style
|
2023-02-14 23:31:57 +03:00 |
|
Viktor Fomin
|
c0cfb921f9
|
Client: Confirm: ChangePassword: add error toast
|
2023-02-14 22:26:34 +03:00 |
|
Viktor Fomin
|
696194c157
|
Client: About: allow select all text
|
2023-02-14 22:05:20 +03:00 |
|
Timofey Boyko
|
9e612f4fa4
|
Merge branch 'bugfix/fix-desktop-navigation' of https://github.com/ONLYOFFICE/DocSpace into bugfix/fix-desktop-navigation
|
2023-02-14 19:17:34 +03:00 |
|
Timofey Boyko
|
4668615fac
|
Web:Client:Pages: fix accounts header height for tablet
|
2023-02-14 19:17:18 +03:00 |
|
|
44126aaf54
|
Merge branch 'develop' into bugfix/spam-media-removal
|
2023-02-14 18:55:50 +03:00 |
|
|
3693d7ee7e
|
Merge branch 'develop' into bugfix/fix-desktop-navigation
|
2023-02-14 18:38:22 +03:00 |
|
|
fb4a9f9046
|
Merge branch 'develop' into bugfix/Bug61073
|
2023-02-14 18:27:39 +03:00 |
|
|
10e285c499
|
Merge branch 'develop' into bugfix/login-confirm-style
|
2023-02-14 17:04:34 +03:00 |
|
|
d6cc4de555
|
Merge pull request #1207 from ONLYOFFICE/bugfix/viewer-timeout
Web: Components: timeout has been shortened for viewer
|
2023-02-14 17:00:40 +03:00 |
|
Akmal Isomadinov
|
8b1e94a2b2
|
Merge branch 'feature/refactoring-image-viewer' of github.com:ONLYOFFICE/DocSpace into feature/refactoring-image-viewer
|
2023-02-14 18:55:49 +05:00 |
|
Akmal Isomadinov
|
753be7eb9e
|
Web:Components:Viewer:Styled-Viewer Fixed title overflow in mobile viewer
|
2023-02-14 18:55:31 +05:00 |
|
|
7fc3d15536
|
Merge branch 'develop' into feature/refactoring-image-viewer
|
2023-02-14 16:13:20 +03:00 |
|
|
0621043d42
|
Merge branch 'develop' into bugfix/redirect-after-payment
|
2023-02-14 16:05:32 +03:00 |
|
Timofey Boyko
|
59e9c2e560
|
Web:Common:Components:Navigation: rename isDropBox to isDropBoxComponent
|
2023-02-14 15:56:21 +03:00 |
|
DmitrySychugov
|
c8da0fe2c6
|
Web: Common: fixed the ability to spam deleting a media file with hotkey
|
2023-02-14 17:32:55 +05:00 |
|
Timofey Boyko
|
7479a459f4
|
Web:Client:Settings: fix useless scroll for free user
|
2023-02-14 13:57:27 +03:00 |
|
|
596f4213b5
|
Web: Update height of gallery preview on mobile
|
2023-02-14 13:53:49 +03:00 |
|
|
f05db04360
|
Web: Update InfoPanel padding on mobile
|
2023-02-14 13:52:59 +03:00 |
|
Viktor Fomin
|
92e7b9494a
|
Fix Bug 61073: Implement the ability to copy text in the About window
|
2023-02-14 13:39:14 +03:00 |
|
Viktor Fomin
|
a8f3b831e5
|
Merge branch 'develop' into bugfix/login-confirm-style
|
2023-02-14 13:07:53 +03:00 |
|
|
242a3416f2
|
Web: Fix left border display on FormGallery
|
2023-02-14 13:00:49 +03:00 |
|
|
9b36707fbd
|
Web: Changed "DeveloperTools" translation
|
2023-02-14 12:55:16 +03:00 |
|
|
fbdcface7e
|
Web: InfoPanel: Fix height of thumbnail preview
|
2023-02-14 12:47:17 +03:00 |
|
|
f4700e8e10
|
Web: Tiles: Set object-fit: none;
|
2023-02-14 12:21:30 +03:00 |
|
Timofey Boyko
|
de38d6da97
|
Web:Common:Components:Navigation: fix height for tablet view at desktop client
|
2023-02-14 10:47:49 +03:00 |
|
Mushka Nikita
|
79e4343b2e
|
Merge branch 'feature/entries-trash-origin' of github.com:ONLYOFFICE/AppServer into feature/entries-trash-origin
|
2023-02-14 03:26:01 +03:00 |
|
Mushka Nikita
|
629effb5d2
|
added trash erasure warning
|
2023-02-14 03:23:06 +03:00 |
|
Viktor Fomin
|
c13a2529f6
|
Merge branch 'develop' into bugfix/login-confirm-style
|
2023-02-13 23:27:13 +03:00 |
|
|
d4f9109781
|
Added displaying Room column + refactoring
|
2023-02-13 20:02:35 +03:00 |
|
Mushka Nikita
|
ecfcaa9487
|
added new properties to pass from files fetching
|
2023-02-13 18:30:58 +03:00 |
|
Mushka Nikita
|
9583f4a47e
|
added remaining days data to rows view
|
2023-02-13 18:30:13 +03:00 |
|
Mushka Nikita
|
d08172cd0b
|
fixed erasure cell
|
2023-02-13 18:29:37 +03:00 |
|
|
a6a8de1b14
|
Merge branch 'develop' into feature/entries-trash-origin
|
2023-02-13 18:26:02 +03:00 |
|
|
16029d7c3b
|
Update SelectionArea.js
Fix InfoPanel tabs show on click
|
2023-02-13 18:23:52 +03:00 |
|
|
8ed8429ebf
|
Changed sortBy Erasure
|
2023-02-13 17:55:43 +03:00 |
|
|
b405d3d215
|
Web: Fix display erasure on row view
|
2023-02-13 17:55:03 +03:00 |
|
DmitrySychugov
|
0354fbb9c5
|
Web: Components: timeout has been shortened for viewer
|
2023-02-13 19:07:42 +05:00 |
|
|
30fc2e6ac5
|
Web: Files: fixed dnd
|
2023-02-13 16:58:49 +03:00 |
|
|
394934edf1
|
Fix Erasure displaying
|
2023-02-13 16:48:01 +03:00 |
|
Akmal Isomadinov
|
6c7a76c18a
|
Merge branch 'develop' into feature/refactoring-image-viewer
|
2023-02-13 18:40:56 +05:00 |
|
Akmal Isomadinov
|
e1d75111cb
|
Web:Client:Pages:Home:MediaViewer Added setAlreadyFetchingRooms
|
2023-02-13 18:33:22 +05:00 |
|
Akmal Isomadinov
|
0dfb8394fc
|
Web:Common:components:MediaViewer Added ViewerWrapper
|
2023-02-13 18:28:33 +05:00 |
|
Akmal Isomadinov
|
dfd62a046e
|
Web:Common:Components:MediaViewer:Sub-Components:Viewer Refactoring and rename the Viewer components to ViewerWrapper
|
2023-02-13 18:26:24 +05:00 |
|
Akmal Isomadinov
|
0885f82a8e
|
Web:Common:Components:MediaViewer:Helpers Added type guard isSeparator
|
2023-02-13 18:20:11 +05:00 |
|
Akmal Isomadinov
|
8dff763e28
|
Web:Common:Components:MediaViewer:Types Updated type ContextMenuType
|
2023-02-13 18:17:12 +05:00 |
|
Akmal Isomadinov
|
581f08a226
|
Web:Common:Components:MediaViewer:Sub-Components:Added StyledDropDownItem
|
2023-02-13 18:15:36 +05:00 |
|
Akmal Isomadinov
|
da1cf65dd6
|
Web:Common:Components:MediaViewer:Sub-Components: Added StyledDropDown
|
2023-02-13 18:14:43 +05:00 |
|
Akmal Isomadinov
|
ecc9fcfd9e
|
Web:Common:Components:MediaViewer:Helpers: Added getCustomToolbar method
|
2023-02-13 18:13:16 +05:00 |
|
Mushka Nikita
|
108e60b6eb
|
fixed main button infoPanel positioning
|
2023-02-13 15:19:30 +03:00 |
|
Mushka Nikita
|
663b7931ab
|
added erasure column to trash
|
2023-02-13 15:19:02 +03:00 |
|
|
592e55fb13
|
Fixed Bug 60990 - Files.Archived.Drag’n’drop. ‘You don't have enough permission to move the file’.
|
2023-02-13 15:12:17 +03:00 |
|
|
13976f8101
|
Web: Files: fixed drag
|
2023-02-13 15:10:57 +03:00 |
|
Viktor Fomin
|
2962f028e7
|
Client: Confirm: redesign activateUser
|
2023-02-13 14:52:24 +03:00 |
|
Viktor Fomin
|
9c7d1d1097
|
Merge branch 'develop' into bugfix/login-confirm-style
|
2023-02-13 14:44:10 +03:00 |
|
Viktor Fomin
|
ea1cab0e9e
|
Client: Confirm: redesign createUser
|
2023-02-13 14:19:56 +03:00 |
|
DmitrySychugov
|
38d443fbd4
|
Merge branch 'bugfix/deletion-with-hotkey' of github.com:ONLYOFFICE/DocSpace into bugfix/deletion-with-hotkey
|
2023-02-13 16:19:38 +05:00 |
|
DmitrySychugov
|
44e02b0673
|
Web: Common: fixed condition
|
2023-02-13 16:19:21 +05:00 |
|
Viktor Fomin
|
95c6dc0763
|
Client: Confirm: DeactivatePortal: fix
|
2023-02-13 14:15:41 +03:00 |
|
Viktor Fomin
|
3abf774d03
|
Client: Confirm: redesign tfaAuth
|
2023-02-13 14:12:40 +03:00 |
|
Viktor Fomin
|
90e3ba34e6
|
Client: Confirm: redesign tfaActivation
|
2023-02-13 14:12:33 +03:00 |
|
|
013d6165a7
|
Merge branch 'develop' into bugfix/deletion-with-hotkey
|
2023-02-13 13:46:37 +03:00 |
|
|
d0c337dc50
|
Merge branch 'develop' into bugfix/61104
|
2023-02-13 13:37:52 +03:00 |
|
|
4354bccef3
|
Web: PortalSettings: Deleted useless code.
|
2023-02-13 13:34:40 +03:00 |
|
|
244612da1a
|
Web: PortalSettings: Payments: Added back url after payment.
|
2023-02-13 13:32:49 +03:00 |
|
Viktor Fomin
|
e0006866a7
|
Merge branch 'develop' into bugfix/login-confirm-style
|
2023-02-13 13:26:57 +03:00 |
|
|
640d8d6632
|
Merge branch 'develop' into bugfix/61099
|
2023-02-13 13:15:52 +03:00 |
|
Elyor Djalilov
|
f4fc720885
|
fix width for different screens
|
2023-02-13 14:28:00 +05:00 |
|
DmitrySychugov
|
e700c32494
|
Fixed Bug 61102 - Web: Common: removed the window with deletion if there are no rights or the room is in the archive
|
2023-02-13 14:24:11 +05:00 |
|
Akmal Isomadinov
|
56bf72cfb8
|
Web:Common:Components:MediaViewer Fixed bug 61104
|
2023-02-13 14:07:53 +05:00 |
|
|
d1f6ba2d3c
|
Web: portalSettings: deleted useless code.
|
2023-02-13 11:47:15 +03:00 |
|
Akmal Isomadinov
|
30649b27d4
|
Web:Common:Components:MediaViewer Updated type getIcon
|
2023-02-13 13:46:50 +05:00 |
|
Akmal Isomadinov
|
7be6542a32
|
Web:Common:Common:Components:MediaViewer:Types Added type ContextMenuModel
|
2023-02-13 13:45:42 +05:00 |
|
Akmal Isomadinov
|
a227e3e75b
|
Web:Common:Components:MediaViewer:Sub-Components Added Viewer
|
2023-02-13 13:44:09 +05:00 |
|
|
db5a8b3763
|
Merge branch 'bugfix/restore-from-local-file' of github.com:ONLYOFFICE/AppServer into bugfix/restore-from-local-file
|
2023-02-13 11:24:23 +03:00 |
|
|
2e69d83683
|
Web: portalSettings: Restore: Deleted useless code.
|
2023-02-13 11:23:24 +03:00 |
|
|
56ce6aea67
|
Merge branch 'develop' into bugfix/restore-from-local-file
|
2023-02-13 10:21:01 +03:00 |
|
Viktor Fomin
|
0f3fd06f4f
|
Merge branch 'develop' into bugfix/login-confirm-style
|
2023-02-12 14:50:49 +03:00 |
|
|
d69609104e
|
Merge pull request #1194 from ONLYOFFICE/bugfix/dark-theme-color
fixed color
|
2023-02-10 19:25:09 +03:00 |
|