Eugen Rochko
|
dad3132046
|
[Glitch] Fix audio and video items in account gallery in web UI
Port 6cc5b822f5 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-15 15:48:24 +02:00 |
|
ThibG
|
0520273573
|
[Glitch] Audio player visualization improvements
Port a2abe35e0f to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-10 17:07:41 +02:00 |
|
ThibG
|
e248399220
|
[Glitch] Freeze scroll position when a dropdown menu is open in the TL
Port 6fda3cbbeb to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-10 17:05:44 +02:00 |
|
Sasha Sorokin
|
042c32ea3b
|
[Glitch] Replace repetitive blurhash code with component (#14267)
Port 61c07c3731 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-10 16:59:53 +02:00 |
|
Thibaut Girka
|
0fe5deae89
|
Change styling of account note editing buttons
Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
|
2020-07-09 12:19:43 +02:00 |
|
ThibG
|
11446be6d1
|
[Glitch] Fix new accent color not refreshing when changing thumbnail for audio uploads
Port 0d2135a461 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-08 15:26:28 +02:00 |
|
ThibG
|
b27eecdbfc
|
[Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail
Port d308a863fb to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-08 15:26:02 +02:00 |
|
ThibG
|
a513997367
|
[Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail
Port 2581715491 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-08 15:25:31 +02:00 |
|
ThibG
|
4acb7efb4b
|
Merge pull request #1372 from ThibG/glitch-soc/fixes/local-only-public-option
Add option to show local-only toots in public timeline
|
2020-07-07 19:58:12 +02:00 |
|
Thibaut Girka
|
64b6c20676
|
Change styling and layout of account notes UI
|
2020-07-07 19:25:42 +02:00 |
|
Thibaut Girka
|
a9b13804e2
|
Change account note placeholder name since the design has diverged upstream
|
2020-07-07 19:25:42 +02:00 |
|
Thibaut Girka
|
170b38c3f4
|
Fix being unable to add account notes
|
2020-07-07 19:25:42 +02:00 |
|
Sasha Sorokin
|
a3ac322ded
|
[Glitch] Replace shortNumberFormat with <ShortNumber>
Port cb2adaaf9d to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-07 19:25:06 +02:00 |
|
Eugen Rochko
|
6c7ac1b48f
|
[Glitch] Add ability to choose media thumbnail in web UI
Port 06fc6a9cd4 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-07 15:58:49 +02:00 |
|
ThibG
|
8b17d47e12
|
[Glitch] Fix hashtag column options styling
Port a783bdf4ad to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-07 15:58:49 +02:00 |
|
Thibaut Girka
|
d973e11061
|
Add UI option to show local-only toots in public timeline
|
2020-07-06 21:12:06 +02:00 |
|
Eugen Rochko
|
69cddc3909
|
[Glitch] Add color extraction for audio thumbnails
Port 99f3a55540 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-05 20:18:51 +02:00 |
|
Eugen Rochko
|
ad73e05f46
|
[Glitch] Fix audio modals not using blurhash and poster
Port 162adf61f2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-05 20:18:51 +02:00 |
|
Eugen Rochko
|
9b3677d509
|
[Glitch] Add customizable thumbnails for audio and video attachments
Port 64aac30733 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-02 17:31:09 +02:00 |
|
Eugen Rochko
|
8999eea707
|
[Glitch] Fix various issues around OpenGraph representation of media
Port audio player changes from 662a49dc3f to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-02 17:31:09 +02:00 |
|
Eugen Rochko
|
06309129be
|
[Glitch] Fix audio/video/images/cards not reacting to window resizes in web UI
Port bb9ca8a587 to glitch-soc
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-02 17:31:09 +02:00 |
|
Eugen Rochko
|
1c58420831
|
[Glitch] Change volume control and download buttons in web UI
Port 419ad6248b to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-02 17:31:09 +02:00 |
|
ThibG
|
1ad79d11f3
|
[Glitch] Fix audio player not working when media files are hosted on a different domain
Port aaf91abffa to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-02 17:31:09 +02:00 |
|
Eugen Rochko
|
ad978ab1d4
|
[Glitch] Change design of audio players in web UI
Port 75a2b8f815 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-02 17:31:09 +02:00 |
|
Takeshi Umeda
|
1c8eb9bcf7
|
[Glitch] Fix the conditions for incomplete remote content
Port 7548a474a5 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-07-02 13:58:50 +02:00 |
|
ThibG
|
511edccf61
|
[Glitch] Add user notes on accounts
Port 65506bac3f to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-06-30 23:32:02 +02:00 |
|
ThibG
|
934bacd05f
|
[Glitch] Change sensitive preview cards to not blur text
Port a1ad2ad951 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-06-30 23:08:24 +02:00 |
|
ThibG
|
327f6309e4
|
[Glitch] Fix design issues with sensitive preview cards
Port 1d2b0d2121 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-06-26 13:28:52 +02:00 |
|
Eugen Rochko
|
2bb25c7730
|
[Glitch] Fix various issues around OpenGraph representation of media
Port front-end changes (except for audio player) from 662a49dc3f to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-06-26 13:23:56 +02:00 |
|
Takeshi Umeda
|
83bc9f68af
|
[Glitch] Fix modifier key to keep the EmojiPicker on macOS
Port 434a6d0b15 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-06-24 15:56:43 +02:00 |
|
Thibaut Girka
|
5d12b63e79
|
Simplify filtering condition
|
2020-06-23 16:09:36 +02:00 |
|
ash lea
|
c1377049c6
|
never filter own posts from timeline
|
2020-06-23 16:09:36 +02:00 |
|
Eugen Rochko
|
9a641a5a0e
|
[Glitch] Add hints about incomplete remote content to web UI
Port 3e9dc4044b to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-06-17 17:48:04 +02:00 |
|
ThibG
|
65a9b788fc
|
[Glitch] Fix initial audio volume not corresponding to what's displayed
Port 755e8c76ab to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-06-17 17:20:14 +02:00 |
|
ThibG
|
00cd919750
|
[Glitch] Add hotkey for toggling content warning composer field
Port 6b6a9d0ea3 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-06-09 11:14:20 +02:00 |
|
ThibG
|
776aff9656
|
[Glitch] Hide sensitive preview cards with blurhash
Port 8e96510b25 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-06-09 11:01:31 +02:00 |
|
Brian C. Lindner
|
a8559458c3
|
[Glitch] Allow Ctrl-click to keep EmojiPicker window open
Port 64154c5161 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-06-01 18:31:42 +02:00 |
|
ThibG
|
9bd30b8dd5
|
[Glitch] Fix timeline markers not working on Chrome
Port 5aff2a6957 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-05-29 20:02:30 +02:00 |
|
Thibaut Girka
|
7a74e46b77
|
Fix one import being made on mastodon's codebase instead of glitch-soc's
|
2020-05-28 15:14:12 +02:00 |
|
Takeshi Umeda
|
44ea965557
|
[Glitch] Fix local streaming of hashtag timelines
Port 3a1a21ad57 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-05-28 14:05:21 +02:00 |
|
Thibaut Girka
|
c8cee24cb3
|
Fix Cmd-Enter not working to send toot
Fixes #1333
|
2020-05-26 10:15:35 +02:00 |
|
ThibG
|
d147dd7588
|
[Glitch] Change “hide/show boosts from …” menu to be hidden when the account is muted
Port 92f85bea52 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-05-13 23:17:10 +02:00 |
|
ThibG
|
6a17fa2b99
|
[Glitch] Fix first poll option not being focused when adding a poll
Port af6d356279 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-05-13 23:17:10 +02:00 |
|
Takeshi Umeda
|
559214c33f
|
[Glitch] Add remote only to public timeline
Port 26b08a3c54 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-05-10 16:19:59 +02:00 |
|
ThibG
|
7ea8b07b93
|
[Glitch] Fix page incorrectly scrolling when bringing up dropdown menus
Port 77ec0875ea to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-05-03 21:47:11 +02:00 |
|
ThibG
|
572e89e563
|
[Glitch] Fix expanded video player issues
Port c955f98d36 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-04-25 15:28:16 +02:00 |
|
ThibG
|
ce33822e2c
|
[Glitch] Fix and refactor keyboard navigation in dropdown menus
Port 80182eda62 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-04-25 15:24:02 +02:00 |
|
Takeshi Umeda
|
7ceeb97f3d
|
[Glitch] Add local only to hashtag timeline
Port front-end changes from 2c7128c7f0 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-04-20 16:52:56 +02:00 |
|
ThibG
|
a08a2130f0
|
[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists
Port ec31b1b752 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-04-12 17:01:41 +02:00 |
|
Thibaut Girka
|
51bbf0b68d
|
Clean up some dead code
|
2020-04-10 14:47:06 +02:00 |
|
ThibG
|
fd7a37c371
|
[Glitch] Add explanation as to why unlocked accounts may have follow requests
Port d3ff06a320 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-04-04 21:59:49 +02:00 |
|
Sasha Sorokin
|
b367dd713e
|
[Glitch] Improve polls: option lengths & redesign
Port 37b3985bfa to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-04-02 20:52:53 +02:00 |
|
Mélanie Chauvel (ariasuni)
|
2e337d850f
|
[Glitch] Improve toot clicking areas
Port part of 1fb92037e4 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-04-02 20:49:43 +02:00 |
|
ThibG
|
faa56643b8
|
[Glitch] Fix frontend crash when deleting announcements
Port 858d0dd168 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-03-27 22:06:42 +01:00 |
|
Daniel Sockwell
|
9da4bd098c
|
[Glitch] Fix frontend crash when deleting announcements
Port 8758221e73 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-03-22 16:31:01 +01:00 |
|
mayaeh
|
912f4a2eba
|
[Glitch] Change the string "hidden" to "blocked" in WebUI
Port 310d729745 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-03-22 16:29:51 +01:00 |
|
Thibaut Girka
|
7115b0b8c9
|
Fix missing media description dialog when sending toots with keyboard shortcuts
|
2020-03-14 14:59:14 +01:00 |
|
Thibaut Girka
|
531658d6cf
|
Fix posting privacy on secondary button with missing description confirmation dialog
|
2020-03-14 12:33:50 +01:00 |
|
Thibaut Girka
|
e53622442c
|
Fix privacy icon being displayed twice in glitch-soc Web UI
Fixes #1298
|
2020-03-11 23:25:15 +01:00 |
|
ThibG
|
9c29229587
|
[Glitch] Add support for links to statuses in announcements to be opened in web UI
Port aa67036b41 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-03-08 20:46:15 +01:00 |
|
Bèr Kessels
|
fc53d9cc76
|
[Glitch] Code style improvements in JavaScript
Port fd76955f39 to glitch-soc
* JS-linter: fix trailing comma's
* Configure eslinter to ignore this onchange error.
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-03-08 20:43:53 +01:00 |
|
Mélanie Chauvel (ariasuni)
|
35d2189ac8
|
[Glitch] Change description of privacy levels to be more intuitive in web UI
Port 4063f9f278 to glitch-soc
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-03-08 20:37:13 +01:00 |
|
ThibG
|
c8f36a71ea
|
[Glitch] Change the string "Hide everything from …" to "Block domain …" in web UI
Port 39453de232 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-03-08 20:14:20 +01:00 |
|
Mélanie Chauvel (ariasuni)
|
eae96cb204
|
[Glitch] Add tooltips to audio/video player buttons
Port 036ba3f510 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-03-08 19:59:42 +01:00 |
|
Thibaut Girka
|
0d41fef506
|
Document alt+enter
|
2020-02-22 23:07:29 +01:00 |
|
Thibaut Girka
|
955f838f9d
|
Fix clicking on the “TOOT” button send bogus visibility parameter
|
2020-02-16 00:10:45 +01:00 |
|
Thibaut Girka
|
40798cba41
|
Fix alt+enter changing visibility setting without sending toot when toot is empty
|
2020-02-14 22:38:24 +01:00 |
|
Thibaut Girka
|
3d7fd4a2df
|
Fix boosting private toots in detailed view
|
2020-02-09 22:15:49 +01:00 |
|
ThibG
|
e443874024
|
[Glitch] Fix native share button not being displayed for unlisted toots
Port 02236332ba to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-02-09 12:29:51 +01:00 |
|
fuyu
|
b9aa57d5bf
|
[Glitch] Don't display toggle reveal button in video modal when full screen
Port 5711899c59 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-02-06 21:39:26 +01:00 |
|
ThibG
|
3dcb279da3
|
[Glitch] Change how unread announcements are handled
Port 3adc722d1c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-02-03 09:31:32 +01:00 |
|
Thibaut Girka
|
e135b293fa
|
Fetch last read notification id to update unread notification count on load
|
2020-02-01 19:53:01 +01:00 |
|
Eugen Rochko
|
ed5fb51168
|
[Glitch] Change announcements to be collapsed on page load in web UI
Port 0fcc4b1c56 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-01-28 19:17:06 +01:00 |
|
Eugen Rochko
|
b0139dcf5e
|
[Glitch] Add animations to announcement reactions
Port dd4eec6bf6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-01-27 16:05:37 +01:00 |
|
Eugen Rochko
|
e36d0a98cc
|
[Glitch] Add streaming API updates for announcements being modified or deleted
Port b9d74d4076 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-01-27 16:01:06 +01:00 |
|
Thibaut Girka
|
8924743349
|
Refactor notifications cleaning mode
|
2020-01-26 14:55:03 +01:00 |
|
ThibG
|
5e4d1f699e
|
[Glitch] Fix “new items glow” being displayed above settings and announcements
Port 90b13ffd00 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-01-25 20:05:36 +01:00 |
|
ThibG
|
6ce72f1fee
|
[Glitch] Improve announcements design
Port 48c55b6392 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-01-25 16:57:03 +01:00 |
|
Eugen Rochko
|
4e1efacfac
|
[Glitch] Add limit of 8 different reaction types per announcement
Port f816da9c64 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-01-25 10:36:27 +01:00 |
|
Eugen Rochko
|
f1e4738f81
|
[Glitch] Add number animations
Port 76f1ed834e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-01-25 10:36:27 +01:00 |
|
Sasha Sorokin
|
2bde217ea5
|
[Glitch] Fix unlocalized dropdown button title
Port 1268e3b572 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-01-25 10:20:05 +01:00 |
|
Thibaut Girka
|
1f8563c256
|
Rename DropdownMenu's ariaLabel to title, to reduce unnecessary changes with upstream
|
2020-01-25 10:17:13 +01:00 |
|
Eugen Rochko
|
376e524278
|
[Glitch] Add announcements
Port front-end changes from f52c988e12 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-01-24 16:45:29 +01:00 |
|
ThibG
|
4f51fe03c9
|
[Glitch] Add “account timeline” filter category
Port JS changes from 43daeccccb to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-01-24 15:27:15 +01:00 |
|
ThibG
|
de76a8969e
|
[Glitch] Fix unfollow confirmations in account directory
Port ec3ee67564 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-01-24 15:25:48 +01:00 |
|
Thibaut Girka
|
180f138394
|
Make prepending “re: ” to CWs on reply optional
|
2020-01-07 19:05:31 +01:00 |
|
ThibG
|
5636c94fe9
|
[Glitch] Fix reuse of detailed status components
Port 12a9813a0c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2020-01-07 16:30:53 +01:00 |
|
Thibaut Girka
|
49027ee948
|
Fix erroneous inclusion of upstream code
|
2019-12-07 15:53:04 +01:00 |
|
Takeshi Umeda
|
510e527663
|
[Glitch] Add basic support for group actors
Port f43f1e0184 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-12-07 15:48:26 +01:00 |
|
ThibG
|
1e1293e3c8
|
[Glitch] Add follow_request notification type
Port 911cc14481 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-12-07 15:48:26 +01:00 |
|
Eugen Rochko
|
fae7e0cace
|
[Glitch] Fix conversations not having an unread indicator in web UI
Fix ed73376f1c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-12-01 12:21:55 +01:00 |
|
ThibG
|
776352d329
|
[Glitch] Add hotkey for opening media files
Port a690b3e470 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-11-30 17:52:12 +01:00 |
|
ThibG
|
7ce7575549
|
[Glitch] Fix OCR with delete & redraft
Port e7a7f88df7 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-11-30 17:36:49 +01:00 |
|
Thibaut Girka
|
93b8aec7b7
|
Link move target account
|
2019-11-27 17:37:01 +01:00 |
|
Thibaut Girka
|
93cb162d4a
|
Show acct of target account
|
2019-11-27 17:37:01 +01:00 |
|
Thibaut Girka
|
014c2cad21
|
Add moved account warning
|
2019-11-27 17:37:01 +01:00 |
|
ThibG
|
962f485423
|
[Glitch] Change media description label to be context-sensitive
Port e86234b1e9 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-11-23 19:07:23 +01:00 |
|
ThibG
|
64225f4ac2
|
[Glitch] Fix unread toot indicator not honoring onlyMedia in public and community timelines
Port 0d6da8892a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-11-20 17:56:35 +01:00 |
|
ThibG
|
44acac0dcd
|
[Glitch] Fix WebUI allowing to upload more items than the limit
Port 66684c489c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-11-07 14:31:53 +01:00 |
|
ThibG
|
734181c3bf
|
[Glitch] Fix filtered out items being counted as pending items
Port 3db3c10762 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-11-06 14:55:12 +01:00 |
|