Henry Jameson
|
3df7c1977f
|
fixes
|
2018-04-07 16:40:08 +03:00 |
|
Henry Jameson
|
33b1d85921
|
border-radii moved to variables, made rgbo colors use theme data, customizable
from settings screen.
|
2018-04-07 16:40:08 +03:00 |
|
Henry Jameson
|
acdb5e5c7a
|
cleanup. added fallback mechanism for IE11 and unsupported browsers.
|
2018-04-07 16:36:35 +03:00 |
|
Henry Jameson
|
aa0564406a
|
getting rid of baseXX, some small fixes. Seems to be usable.
|
2018-04-07 16:34:11 +03:00 |
|
hakabahitoyo
|
02bfea4af3
|
Change color
|
2018-04-04 15:04:44 +09:00 |
|
|
c72cc431ec
|
Add link to original (remote) user profile page
|
2018-04-04 05:45:01 +00:00 |
|
lambda
|
e4b2fdf124
|
Merge branch 'stillGifs' into 'develop'
Still gifs
See merge request pleroma/pleroma-fe!193
|
2018-04-03 09:14:42 +00:00 |
|
hakabahitoyo
|
ef67bd693e
|
using router-link in who-to-follow-panel
|
2018-03-28 18:18:36 +09:00 |
|
hakabahitoyo
|
5a97cfb959
|
who-to-follow-panel using internal user link
|
2018-03-28 17:45:35 +09:00 |
|
Hakaba Hitoyo
|
caad818009
|
using internal link to users
|
2018-03-28 16:56:47 +09:00 |
|
Hakaba Hitoyo
|
96426425b8
|
refactoring
|
2018-03-28 15:57:11 +09:00 |
|
Hakaba Hitoyo
|
6b6b740684
|
Merge remote-tracking branch 'origin/feature/who-to-follow-panel' into feature/who-to-follow-panel-2
|
2018-03-28 14:55:12 +09:00 |
|
qwexvf
|
0a62341135
|
fix typeError in delete_button.js
not a big thing just fixes a typeError.
|
2018-03-20 22:33:43 +09:00 |
|
dtluna
|
bfb2d481bb
|
Add i18n for User Timeline
|
2018-03-12 03:59:03 +03:00 |
|
Henry Jameson
|
0c4dc26808
|
after nine years of development, hopefully, it has been worth the weight
|
2018-03-12 02:31:33 +03:00 |
|
Henry Jameson
|
5efd8a4aa6
|
fixes
|
2018-03-12 01:30:27 +03:00 |
|
Henry Jameson
|
55bc1a3414
|
fixed stretched spurdo in notifications, misc fixes, detect gif by extension for now
|
2018-03-12 01:30:27 +03:00 |
|
Henry Jameson
|
3257991f41
|
unfinished fetch() version that doesn't work
|
2018-03-12 01:30:27 +03:00 |
|
Henry Jameson
|
b10787d23c
|
first ver
|
2018-03-12 01:30:27 +03:00 |
|
Hakaba Hitoyo
|
b32573138b
|
Add who-to-follow-panel
|
2018-02-24 23:04:44 +09:00 |
|
eal
|
cbd113f762
|
Merge branch 'feature/user-picker-keyboard-support' into 'develop'
Add keyboard support for user/emoji picker.
Closes #56
See merge request pleroma/pleroma-fe!200
|
2018-02-24 08:08:41 +00:00 |
|
dtluna
|
591dadad13
|
Disable the submit button and apply error class to the characters left indicator
|
2018-02-11 17:07:29 +03:00 |
|
Hakaba Hitoyo
|
ebd8300e36
|
slove conflict
|
2018-02-10 10:17:58 +09:00 |
|
dtluna
|
dcbbd7c53e
|
Add styles on the characters left indicator
|
2018-02-09 18:22:29 +03:00 |
|
dtluna
|
6c424c355c
|
Add characters left being displayed
|
2018-02-09 17:51:04 +03:00 |
|
eal
|
e647bb22bb
|
Add keys to all component lists.
|
2018-02-04 17:26:46 +02:00 |
|
Hakaba Hitoyo
|
013f11497f
|
slove-conflict
|
2018-02-04 08:36:10 +09:00 |
|
Henry Jameson
|
338245eb63
|
updated css and stuff for color picker in styles
|
2018-02-03 22:23:38 +03:00 |
|
Henry Jameson
|
71bdbdf146
|
wip, styles are a bit broken tho
|
2018-02-03 21:15:43 +03:00 |
|
hakabahitoyo
|
95cba854f3
|
add instance specific panel
|
2018-02-04 00:27:33 +09:00 |
|
eal
|
88c8818deb
|
Add keyboard support for user/emoji picker.
Tab cycles between candidates, shift-tab cycles backwards.
Enter does the action.
|
2018-02-03 16:59:47 +02:00 |
|
Roger Braun
|
d97e6777ba
|
Update vue version.
|
2018-02-03 15:47:51 +01:00 |
|
shp
|
06265078d8
|
Fix typo in fav/rt fix
|
2018-02-03 10:18:53 +02:00 |
|
eal
|
f3f0155d60
|
Fix fav/RT buttons in notifications.
|
2018-02-02 12:27:31 +02:00 |
|
lambda
|
97854eec58
|
Merge branch 'remote-follow-button' into 'develop'
Add remote follow button to local user profiles.
See merge request pleroma/pleroma-fe!198
|
2018-02-02 07:30:58 +00:00 |
|
Shpuld Shpludson
|
f2f9343d2a
|
Merge branch 'fix/emoji-align' into 'develop'
Align custom emoji to middle of line.
See merge request pleroma/pleroma-fe!196
|
2018-02-02 05:38:57 +00:00 |
|
eal
|
664a55fc79
|
Show fav/RT counts even if not logged in.
|
2018-02-02 00:45:29 +02:00 |
|
eal
|
689afecb65
|
Add remote follow button to local user profiles.
|
2018-02-01 21:30:49 +02:00 |
|
lambda
|
3ff39f9b39
|
Merge branch 'feature/normal-emoji-completion' into 'develop'
Add completion for normal emoji.
Closes #15
See merge request pleroma/pleroma-fe!169
|
2018-02-01 16:26:43 +00:00 |
|
eal
|
36e68fba96
|
Merge branch 'develop' into feature/normal-emoji-completion
|
2018-02-01 18:19:36 +02:00 |
|
eal
|
fe2e5ba6f0
|
Align custom emoji to middle of line
|
2018-02-01 17:18:51 +02:00 |
|
aka
|
84b0d54cd0
|
Fixes issue #58
|
2018-01-31 14:48:09 -03:00 |
|
Roger Braun
|
92289e545a
|
Move chat to sidebar.
|
2018-01-26 15:11:34 +01:00 |
|
eal
|
b67c506062
|
Merge branch 'develop' into feature/normal-emoji-completion
|
2017-12-23 19:52:16 +02:00 |
|
eal
|
a058941aed
|
Add follow import to user settings.
|
2017-12-23 17:08:45 +02:00 |
|
Henry Jameson
|
f99e872c35
|
fix australian images
|
2017-12-19 00:15:25 +03:00 |
|
Shpuld Shpludson
|
389c413357
|
Merge branch 'fix/hide-read-button' into 'develop'
Don't show "read" button if there are no new notifications.
See merge request pleroma/pleroma-fe!184
|
2017-12-07 22:00:30 +00:00 |
|
eal
|
07354cc45d
|
Don't show "read" button if there are no new notifications.
|
2017-12-07 23:54:03 +02:00 |
|
eal
|
855f8b4f27
|
Merge branch 'fix/usercard-width' into 'develop'
Fixed width usercards in follow lists.
Closes #48
See merge request pleroma/pleroma-fe!181
|
2017-12-07 17:18:33 +00:00 |
|
eal
|
05f053219b
|
Fixed width usercards in follow lists.
|
2017-12-07 19:11:42 +02:00 |
|
eal
|
ecb8acb155
|
Some css fixes.
Scale chat panel size to viewport height, fit message field to width.
|
2017-12-07 19:03:26 +02:00 |
|
Roger Braun
|
6c4e3a509a
|
Don't display if we don't have a chat.
|
2017-12-05 14:20:34 +01:00 |
|
Roger Braun
|
a03b92e252
|
Post on submit, not on enter.
|
2017-12-05 12:09:54 +01:00 |
|
Roger Braun
|
6ad27959a6
|
Linting.
|
2017-12-05 11:49:40 +01:00 |
|
Roger Braun
|
27be1e0fa3
|
Move chat to own module.
|
2017-12-05 11:47:10 +01:00 |
|
Roger Braun
|
0e51fac2b2
|
Add missing component code.
|
2017-12-05 11:02:41 +01:00 |
|
Roger Braun
|
fbee80474b
|
Basic frontend changes for chat.
|
2017-12-04 19:08:33 +01:00 |
|
Shpuld Shpludson
|
f72d6ec83e
|
Merge branch 'clipboardImage' into 'develop'
Added ability to copy-paste image right from the clipboard.
See merge request pleroma/pleroma-fe!179
|
2017-11-28 20:37:56 +00:00 |
|
Henry Jameson
|
1f413bb816
|
pasting images from clipboard, fuck ye
|
2017-11-28 23:31:40 +03:00 |
|
shpuld
|
bcd10b3475
|
Make star icon in notifications behave like the other icons..
|
2017-11-25 12:57:55 +02:00 |
|
shpuld
|
f02229fed2
|
Add specifity to active classes to make them override theme colors.
|
2017-11-24 23:55:46 +02:00 |
|
lambda
|
2431d35277
|
Merge branch 'feature/flush-timeline-with-holes' into 'develop'
Clear timeline when there's holes between old and new
Closes #54
See merge request pleroma/pleroma-fe!171
|
2017-11-24 07:30:17 +00:00 |
|
lambda
|
38cab5e4b6
|
Merge branch 'fix/better-icon-colors' into 'develop'
Update icons to use base09 where appropriate, calculate base09 by averaging bg and text colors.
See merge request pleroma/pleroma-fe!174
|
2017-11-24 07:29:49 +00:00 |
|
shpuld
|
6b773902e8
|
Fix mistake in flushMarker init, make startFetching behave properly with older statuses existing.
|
2017-11-23 13:46:37 +02:00 |
|
shpuld
|
10be553910
|
Update icons to use base09 where appropriate, calculate base09 by averaging bg and text colors.
|
2017-11-22 01:00:25 +02:00 |
|
shpuld
|
912be5aed9
|
Make the timeline button use the correct func for its text.
|
2017-11-22 00:47:20 +02:00 |
|
shpuld
|
fc1736618b
|
attempt to recognize when holes in timeline for various reasons, clear timeline and fetch older when showing new to get rid of holes
|
2017-11-21 16:12:47 +02:00 |
|
shpuld
|
4e07b89bcf
|
not so \!important after all
|
2017-11-21 10:52:09 +02:00 |
|
shpuld
|
592c1cfd78
|
Fix padding at user card bottom, mismatching border-radii. Sneak in fixes for attachment previews.
|
2017-11-21 10:30:30 +02:00 |
|
shpuld
|
f6b2f6eaee
|
Fix usercard from breaking with certain colors, clean up code structure a bit.
|
2017-11-20 22:45:09 +02:00 |
|
eal
|
581e3e836a
|
Add completion for normal emoji.
|
2017-11-20 20:32:51 +02:00 |
|
lambda
|
8020363680
|
Merge branch 'fix/attachment-fixes-media-upload-unknown-type' into 'develop'
Hide unknown type attachments, polish the upload preview styling
See merge request pleroma/pleroma-fe!168
|
2017-11-20 11:52:46 +00:00 |
|
shpuld
|
280758f867
|
Hide unknown type attachments, polish the upload preview styling
|
2017-11-20 13:27:45 +02:00 |
|
shpuld
|
95cbd19254
|
Unhide completions, strengthen shadows a bit, force the 0.1 shade to always span the full height, make usercard use correct borders.
|
2017-11-20 13:03:02 +02:00 |
|
shpuld
|
a7500410ff
|
Fix color inputs to wrap on mobile, fix timeline background color to not clash with panel headings.
|
2017-11-18 17:41:43 +02:00 |
|
shpuld
|
3534a9a62f
|
Make defaulting to pleroma-dark work when config.json has an invalid theme. Remove logging.
|
2017-11-18 13:27:37 +02:00 |
|
shpuld
|
d65d6e5da4
|
Clean up, use translations, persist theme, add more presets.
|
2017-11-18 13:13:51 +02:00 |
|
shpuld
|
21b31cf599
|
Move custom theming from settings to style-switcher, remove usage of custom .css files, use styles.json instead.
|
2017-11-17 17:24:42 +02:00 |
|
shpuld
|
e13c8c3fd2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into feature/custom-theme
|
2017-11-17 02:17:47 +02:00 |
|
shpuld
|
44073e72fd
|
Update theme editor to have 4 colors, rewrite the color setter, change a LOT of base16 assignments for better consistency.
|
2017-11-17 02:17:36 +02:00 |
|
eal
|
0b0d206295
|
Fix timeline softlock when switching from a loading timeline
|
2017-11-16 15:50:26 +02:00 |
|
Shpuld Shpludson
|
dff1153d1c
|
Merge branch 'fix/user-view-without-posts' into 'develop'
Use state object for user view instead of timeline.
See merge request pleroma/pleroma-fe!161
|
2017-11-14 16:34:32 +00:00 |
|
eal
|
07057043d9
|
Use state object for user view instead of timeline.
Also fetch user if not in the state already.
|
2017-11-14 18:08:03 +02:00 |
|
Shpuld Shpludson
|
ff63be4afd
|
Merge branch 'fix/user-finder-leading-@' into 'develop'
Remove leading @ in user search.
Closes pleroma#71
See merge request pleroma/pleroma-fe!160
|
2017-11-14 15:21:35 +00:00 |
|
eal
|
a5d05bcb10
|
Remove leading @ in user search.
|
2017-11-14 17:03:42 +02:00 |
|
shpuld
|
dc4755f2ff
|
Make goto-check use the correct property to make it work again
|
2017-11-14 08:55:21 +02:00 |
|
shpuld
|
ed84c6acc0
|
First version with naive color extrapolation.
|
2017-11-14 01:37:49 +02:00 |
|
lambda
|
55c4818084
|
Merge branch 'fix/scrollbar-for-taller-posts' into 'develop'
Better handling of taller posts
Closes #40
See merge request pleroma/pleroma-fe!158
|
2017-11-13 18:17:50 +00:00 |
|
lambda
|
024b9ca724
|
Merge branch 'feature/in-reply-to-preview-on-timeline' into 'develop'
In-reply-to previews for posts on timeline
See merge request pleroma/pleroma-fe!157
|
2017-11-13 18:17:34 +00:00 |
|
shpuld
|
a169abcec2
|
Give tall notifications either a scrollbar (mentions), or just cap them and use a cool hider (fav/rt).
|
2017-11-13 19:23:43 +02:00 |
|
shpuld
|
e19a617de1
|
Add a scrollbar for tall spammy posts.
|
2017-11-13 18:39:27 +02:00 |
|
shpuld
|
ab1d1b3dd0
|
Move previews from conversation to status, put the reply preview arrow back on timeline statuses, add a spinner when the preview is still loading.
|
2017-11-13 16:33:54 +02:00 |
|
lambda
|
c3b401167d
|
Merge branch 'fix/css-fixes-attachments-timeline-bottom' into 'develop'
CSS fixes
Closes #39
See merge request pleroma/pleroma-fe!154
|
2017-11-13 09:34:16 +00:00 |
|
lambda
|
d6478068f8
|
Merge branch 'feature/streaming-posts' into 'develop'
Streaming posts
See merge request pleroma/pleroma-fe!151
|
2017-11-13 09:10:44 +00:00 |
|
shpuld
|
bac092d953
|
Make oembeds behave properly, hide empty html attachments, hide overflowing timeline background.
|
2017-11-13 11:08:34 +02:00 |
|
Henry Jameson
|
764331c80b
|
fix white line below buttons in notifications
|
2017-11-13 08:28:21 +03:00 |
|
shpuld
|
46f23b7de7
|
Add an option to automatically show new posts when scrolled to the top, also add fade-in animation for posts.
|
2017-11-13 01:06:48 +02:00 |
|
Henry Jameson
|
c18aace3da
|
imo this looks ugly, compared to general timeline appearance
|
2017-11-13 01:28:08 +03:00 |
|
Henry Jameson
|
46765d5c1a
|
some fixes towards how conversations appear
|
2017-11-13 01:26:43 +03:00 |
|
Henry Jameson
|
ec55d49b88
|
kiinteät venytetyt tunteet
|
2017-11-13 00:57:41 +03:00 |
|
Henry Jameson
|
cbab830d8a
|
fixes fullscreen video having borders and border-radius in firefox
|
2017-11-13 00:50:18 +03:00 |
|
shpuld
|
72806b4a99
|
Check if logged-in when rendering the block button.
|
2017-11-09 10:33:10 +02:00 |
|
Shpuld Shpludson
|
56a0665b2f
|
Merge branch 'fix/pleromabe-is-other-user' into 'develop'
Fix isOtherUser on pleroma-be
See merge request pleroma/pleroma-fe!137
|
2017-11-09 08:23:19 +00:00 |
|
Shpuld Shpludson
|
421221997f
|
Make mentions-timeline use i18n.
|
2017-11-08 21:54:48 +00:00 |
|
eal
|
be943445e9
|
Fix isOtherUser on pleroma-be
|
2017-11-08 19:32:11 +02:00 |
|
shpuld
|
0e716e3cd9
|
Fix oembeds from overflowing on Firefox, fix video border color as well as vertical size.
|
2017-11-08 15:09:02 +02:00 |
|
shpuld
|
4d5782b51f
|
Fix conflict
|
2017-11-08 12:55:10 +02:00 |
|
shpuld
|
191bbe76a8
|
Add a bunch of missed localization strings, update english and finnish to match.
|
2017-11-08 12:34:15 +02:00 |
|
shpuld
|
176421163b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/polish-user-finder-and-nav-buttons
|
2017-11-08 11:27:22 +02:00 |
|
shpuld
|
bfa04bfb11
|
Hide overflowing elements when userfinder is active. Don't scroll on button presses. Make buttons slightly bigger and more spaced out.
|
2017-11-08 11:26:42 +02:00 |
|
eal
|
608d1e6776
|
Add blocks.
|
2017-11-07 22:38:28 +02:00 |
|
Roger Braun
|
7516cd859f
|
Prepare for i18n.
|
2017-11-07 15:14:37 +01:00 |
|
Shpuld Shpuldson
|
acde0b316c
|
Changes inside status html: restrict image/video sizes, make blockquotes waste less space.
|
2017-11-07 12:22:33 +02:00 |
|
Shpuld Shpuldson
|
10bc83018c
|
Deregister scroll listener properly, only fetch more if timeline is visible.
|
2017-11-02 16:26:17 +02:00 |
|
eal
|
447ec91176
|
Actually actually fix image url.
|
2017-09-19 22:58:15 +03:00 |
|
eal
|
f4b1319eff
|
Actually fix image url.
|
2017-09-19 22:54:54 +03:00 |
|
eal
|
70d66c48ad
|
Fix image url.
|
2017-09-19 22:50:08 +03:00 |
|
eal
|
2162ef20b0
|
Add emoji completion.
|
2017-09-19 22:43:20 +03:00 |
|
eal
|
c96a7b582b
|
Remove another cache file.
|
2017-09-17 14:42:04 +03:00 |
|
eal
|
59f07c0704
|
Remove cache file.
|
2017-09-17 14:37:48 +03:00 |
|
eal
|
9abfcb34ef
|
Add tag timeline view.
|
2017-09-17 14:26:35 +03:00 |
|
lambadalambda
|
c6b909570a
|
Merge branch 'fix/upload-buttons-clickable' into 'develop'
Fix hide and cancel buttons on chromium
See merge request !119
|
2017-09-13 04:46:24 -04:00 |
|
eal
|
5e6ffc0e45
|
Make user finder more pleasant.
|
2017-09-10 20:46:42 +03:00 |
|
eal
|
8a51bc6e22
|
Fix hide and cancel buttons on chromium
|
2017-09-10 13:33:02 +03:00 |
|
eal
|
587cd7bcfa
|
Fix 'Statuses' being different color
|
2017-08-27 13:10:25 +03:00 |
|
eal
|
ad6d0a1f0c
|
Move the cog to avatar height
|
2017-08-25 14:59:55 +03:00 |
|
Shpuld Shpuldson
|
7061675e96
|
whoops lint
|
2017-08-24 16:25:26 +03:00 |
|
Shpuld Shpuldson
|
c6798864d4
|
Add an X icon to clear error message from post status form, hack to allow posting empty statuses if they have attachments
|
2017-08-24 16:16:06 +03:00 |
|
Shpuld Shpuldson
|
bf61592b56
|
Round the edge of the user profile user card, make sure 'follows you' stays in the right, fix avatar class conflict.
|
2017-08-23 20:33:20 +03:00 |
|
Shpuld Shpuldson
|
2bc261afba
|
Merge branch 'feature/follow-lists' into 'develop'
Feature/follow lists
See merge request !106
|
2017-08-23 12:40:39 -04:00 |
|
eal
|
e1ec01dc3e
|
Appease linter.
|
2017-08-23 19:21:15 +03:00 |
|
eal
|
ccfc2e57d0
|
Add follower and following views
|
2017-08-23 19:14:06 +03:00 |
|
lambadalambda
|
e5d0965ff1
|
Merge branch 'fix/user-card-changes-and-fixes' into 'develop'
User card changes and fixes
See merge request !104
|
2017-08-22 06:13:10 -04:00 |
|
Shpuld Shpuldson
|
6ad5052044
|
Make pic bigger and remove border and add shadow, make screen name white again, make cog appear only in sidepanel.
|
2017-08-22 12:38:12 +03:00 |
|
Shpuld Shpuldson
|
2ef915c9f1
|
Don't allow posting again while previous hasn't returned
|
2017-08-22 11:43:03 +03:00 |
|
eal
|
4291263cec
|
Add link to profile on usercard avatar and @handle
|
2017-08-21 23:14:05 +03:00 |
|
Shpuld Shpuldson
|
b5e5a8d1e3
|
Use _original profile pic instead of the 48x48 thumbnail in the user card content.
|
2017-08-21 16:45:45 +03:00 |
|
Shpuld Shpuldson
|
d3169b057c
|
Visual indicator for when posting is happening, as well as disabling the button to prevent double-posts.
|
2017-08-21 15:35:14 +03:00 |
|
Shpuld Shpuldson
|
dbf2f1621e
|
Adjust the clickable area of notif avatar to not contain everything below it, adjust the status avatar to not have ghost border on top/right
|
2017-08-20 16:53:48 +03:00 |
|
Shpuld Shpuldson
|
42fb65e274
|
Add error message in post status form when failing to post and don't get rid of post/attachments when failing.
|
2017-08-20 13:16:41 +03:00 |
|
lambadalambda
|
fb3408d64f
|
Merge branch 'feature/profile-editing' into 'develop'
Feature/profile editing
See merge request !95
|
2017-08-19 03:32:44 -04:00 |
|
Shpuld Shpuldson
|
9503b8fa41
|
Remove the profile pic change from the old settings menu since it's in the new profile edit menu.
|
2017-08-18 12:00:59 +03:00 |
|
Shpuld Shpuldson
|
1526b4560c
|
Clean up to have much less redundant code.
|
2017-08-18 11:51:17 +03:00 |
|
Shpuld Shpuldson
|
2084c92dff
|
Force user profile timeline update when the user id changes (like when another user has been searched/found).
|
2017-08-16 16:40:09 +03:00 |
|
Shpuld Shpuldson
|
6d7d173e4d
|
Make linter happy.
|
2017-08-16 00:46:55 +03:00 |
|
Shpuld Shpuldson
|
c4920f2d86
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/profile-editing
|
2017-08-16 00:15:00 +03:00 |
|
lambadalambda
|
dbad99cb4f
|
Merge branch 'feature/follow-notifications' into 'develop'
Add follow notifications.
See merge request !92
|
2017-08-10 12:34:02 -04:00 |
|
lambadalambda
|
3c2073bc8e
|
Merge branch 'fix/user-card-visual-buggery' into 'develop'
User card content visual bugfixes
See merge request !91
|
2017-08-10 12:29:05 -04:00 |
|
eal
|
701112f043
|
Add follow notifications.
|
2017-08-10 19:17:40 +03:00 |
|
Shpuld Shpuldson
|
acf3fd5d91
|
Add new user-settings component/route, add options to change name, bio, avatar, banner and bg. Add those options to api service and backend interactor service.
|
2017-08-02 22:09:40 +03:00 |
|