Bob Mottram
|
de382b87a4
|
Alignment of emoji
|
2019-08-09 18:42:11 +01:00 |
Bob Mottram
|
5ed5aa0d33
|
Emoji in posts
|
2019-08-09 17:18:00 +01:00 |
Bob Mottram
|
6f3eb1cb2b
|
Add emoji icons
|
2019-08-09 13:50:49 +01:00 |
Bob Mottram
|
52162d1b9b
|
Add hashtag conversion to html
|
2019-08-09 12:12:08 +01:00 |
Bob Mottram
|
af32aa08d6
|
Refactor mentions replacements
|
2019-08-09 10:09:21 +01:00 |
Bob Mottram
|
8fdcb93546
|
Formatting of '
|
2019-08-09 09:46:38 +01:00 |
Bob Mottram
|
ed46de3709
|
Terms of service
|
2019-08-08 14:38:33 +01:00 |
Bob Mottram
|
800b50996f
|
nickname from path
|
2019-08-08 09:54:41 +01:00 |
Bob Mottram
|
00b6eeed00
|
Use full domain
|
2019-08-08 09:51:32 +01:00 |
Bob Mottram
|
ec25deea0f
|
Checkbox for bot accounts
|
2019-08-07 21:13:44 +01:00 |
Bob Mottram
|
aa3c0f5fb8
|
Remove debug
|
2019-08-07 18:02:28 +01:00 |
Bob Mottram
|
7f10e62e17
|
debug
|
2019-08-07 17:28:12 +01:00 |
Bob Mottram
|
d929818532
|
debug
|
2019-08-07 17:09:53 +01:00 |
Bob Mottram
|
1645e223f0
|
Follow approve path only contains user
|
2019-08-07 15:08:32 +01:00 |
Bob Mottram
|
527c4c2a24
|
follow accept logic
|
2019-08-07 14:31:11 +01:00 |
Bob Mottram
|
d7d46bdbee
|
Create session
|
2019-08-07 13:50:48 +01:00 |
Bob Mottram
|
71bd312aa3
|
Comments
|
2019-08-07 12:58:01 +01:00 |
Bob Mottram
|
53b5fd4646
|
Follow approvals
|
2019-08-07 12:57:14 +01:00 |
Bob Mottram
|
5781afad2c
|
Extract liked actor
|
2019-08-07 12:05:13 +01:00 |
Bob Mottram
|
0eba942667
|
Send likes to liked actor
|
2019-08-07 12:02:15 +01:00 |
Bob Mottram
|
329e08f8a3
|
Statuses should be visible without login
|
2019-08-07 11:25:57 +01:00 |
Bob Mottram
|
47aa3fbc1e
|
Avoid errors when loading inbox queue items
|
2019-08-05 22:14:38 +01:00 |
Bob Mottram
|
19ae236665
|
Include mentions in new posts
|
2019-08-05 20:13:15 +01:00 |
Bob Mottram
|
4d7e37d6ee
|
Variable name
|
2019-08-05 18:04:43 +01:00 |
Bob Mottram
|
88b0b13ddc
|
Also send to mentioned recipients
|
2019-08-05 17:56:32 +01:00 |
Bob Mottram
|
491df84892
|
missing self
|
2019-08-05 17:31:13 +01:00 |
Bob Mottram
|
6821a4ba31
|
Allow access to shared inbox
|
2019-08-05 17:05:08 +01:00 |
Bob Mottram
|
ba3460418c
|
Lookup of shared inbox
|
2019-08-05 16:22:59 +01:00 |
Bob Mottram
|
646c3ecc1e
|
Consistent shared inbox path
|
2019-08-05 12:08:52 +01:00 |
Bob Mottram
|
438b778dd3
|
Remove unused flag
|
2019-08-05 10:50:45 +01:00 |
Bob Mottram
|
54ebf29e45
|
Obtain nickname
|
2019-08-04 22:25:19 +01:00 |
Bob Mottram
|
6ea8ac7835
|
Include port number in domain during search
|
2019-08-04 21:06:25 +01:00 |
Bob Mottram
|
862cc3b68a
|
Check that deletions are allowed
|
2019-08-04 20:34:15 +01:00 |
Bob Mottram
|
7c7bb45c0d
|
Only show delete icon on posts which can be deleted
|
2019-08-04 20:28:21 +01:00 |
Bob Mottram
|
cc52d917b2
|
Deleting posts from the web interface
|
2019-08-04 19:29:26 +01:00 |
Bob Mottram
|
bbae1dc77d
|
Displaying replies to posts selected from the web interface
|
2019-08-02 19:57:06 +01:00 |
Bob Mottram
|
49deddf1dc
|
Refactoring
|
2019-08-02 19:37:23 +01:00 |
Bob Mottram
|
fd75e68be3
|
Viewing replies
|
2019-08-02 19:04:31 +01:00 |
Bob Mottram
|
511a8767a8
|
Viewing replies to posts
|
2019-08-02 17:49:42 +01:00 |
Bob Mottram
|
e04db12604
|
Blocking and upblocking from web interface dropdown
|
2019-08-02 15:36:03 +01:00 |
Bob Mottram
|
0fb0f89462
|
Add an instance identifier
|
2019-08-02 13:49:34 +01:00 |
Bob Mottram
|
08233c0dff
|
Federation lists for individual accounts
|
2019-08-02 13:11:32 +01:00 |
Bob Mottram
|
3a9bdea0f7
|
Blocking controls on profile screen
|
2019-08-02 12:43:14 +01:00 |
Bob Mottram
|
888f2adf47
|
Correct image ordering when selecting profile pictures
|
2019-08-02 11:10:41 +01:00 |
Bob Mottram
|
b50252c041
|
Metadata removal
|
2019-08-02 10:55:45 +01:00 |
Bob Mottram
|
52a4d17512
|
Selecting profile images
|
2019-08-02 10:52:12 +01:00 |
Bob Mottram
|
f5da898007
|
Undo like from web interface
|
2019-08-01 13:49:16 +01:00 |
Bob Mottram
|
7c7ace43f9
|
Undo announces via the web interface
|
2019-08-01 13:18:22 +01:00 |
Bob Mottram
|
c7ecd001a9
|
Update announce list for associated post if the announce is sent via c2s
|
2019-08-01 12:43:22 +01:00 |
Bob Mottram
|
cfae58b92b
|
Undoing likes via the web interface
|
2019-08-01 10:05:09 +01:00 |
Bob Mottram
|
f9d86cf762
|
Return to previous posts per page
|
2019-07-31 21:41:17 +01:00 |
Bob Mottram
|
1cc81c5138
|
Page up and down icons
|
2019-07-31 21:37:19 +01:00 |
Bob Mottram
|
be1104d0fc
|
Remove spaces from search strings
|
2019-07-31 20:37:29 +01:00 |
Bob Mottram
|
662cfe5744
|
Link announce to web interface
|
2019-07-31 17:47:45 +01:00 |
Bob Mottram
|
fbb7636a3b
|
Reply to post
|
2019-07-31 14:51:10 +01:00 |
Bob Mottram
|
dffe45afda
|
Link follow confirmation to search screen
|
2019-07-31 10:00:44 +01:00 |
Bob Mottram
|
bcd6278e82
|
Search for address
|
2019-07-30 23:34:04 +01:00 |
Bob Mottram
|
8cf9dde826
|
Missing argument
|
2019-07-29 21:40:22 +01:00 |
Bob Mottram
|
cdba45bd68
|
Unfollowing from web interface
|
2019-07-29 21:36:26 +01:00 |
Bob Mottram
|
baa531ecf6
|
Approving or denying follow requests
|
2019-07-29 20:14:14 +01:00 |
Bob Mottram
|
d2ca3af3ec
|
Follow logic
|
2019-07-29 17:13:48 +01:00 |
Bob Mottram
|
54ed777710
|
Follow screen
|
2019-07-29 10:49:46 +01:00 |
Bob Mottram
|
8a24d7437d
|
Include actor image url in links
|
2019-07-28 21:28:47 +01:00 |
Bob Mottram
|
52117ff9e2
|
Dropdown for follow and block
|
2019-07-28 20:54:05 +01:00 |
Bob Mottram
|
f8445f9f4c
|
Port numbers on image attachments
|
2019-07-28 19:06:20 +01:00 |
Bob Mottram
|
f4222bd4f4
|
Cancel button on new post screen
|
2019-07-28 16:16:14 +01:00 |
Bob Mottram
|
f81ca9d66d
|
Redirect after post
|
2019-07-28 15:09:48 +01:00 |
Bob Mottram
|
fcf8399b5a
|
Posting via web interface
|
2019-07-28 14:30:19 +01:00 |
Bob Mottram
|
1c2e073d0c
|
Handle unlisted posts
|
2019-07-28 12:08:14 +01:00 |
Bob Mottram
|
6f37df2135
|
Posting shares from the web interface
|
2019-07-28 09:34:49 +01:00 |
Bob Mottram
|
e6c246fc8e
|
Connect new posts to web interface
|
2019-07-27 23:48:34 +01:00 |
Bob Mottram
|
744b345b30
|
Save image when receiving new post
|
2019-07-27 21:30:58 +01:00 |
Bob Mottram
|
1c8ab532bc
|
New post scope
|
2019-07-26 13:26:41 +01:00 |
Bob Mottram
|
96ef34eb77
|
Add scope icons
|
2019-07-26 11:30:13 +01:00 |
Bob Mottram
|
5e0a7e90ca
|
New post screen
|
2019-07-25 22:39:09 +01:00 |
Bob Mottram
|
abb010589a
|
Login screen customization
|
2019-07-25 20:56:25 +01:00 |
Bob Mottram
|
eda9a081b7
|
Go to inbox by default
|
2019-07-25 20:23:52 +01:00 |
Bob Mottram
|
37a56aed87
|
Login text
|
2019-07-25 20:22:19 +01:00 |
Bob Mottram
|
1c02b79f15
|
digest of sha256
|
2019-07-25 17:50:48 +01:00 |
Bob Mottram
|
8572c235f1
|
Full path on shares images
|
2019-07-25 17:15:02 +01:00 |
Bob Mottram
|
eeba9b5214
|
Only show web interface after login
|
2019-07-25 17:03:58 +01:00 |
Bob Mottram
|
49f6341dd6
|
Remove extra variable
|
2019-07-25 15:38:51 +01:00 |
Bob Mottram
|
6d622122f7
|
Notes
|
2019-07-25 15:30:12 +01:00 |
Bob Mottram
|
719fc3589d
|
Deterministic tokens so that logins from multiple devices are possible
|
2019-07-25 15:24:42 +01:00 |
Bob Mottram
|
80b644c01f
|
Retain the authorized header
|
2019-07-25 12:18:35 +01:00 |
Bob Mottram
|
ca547e7d62
|
Login screen redirects
|
2019-07-25 11:56:24 +01:00 |
Bob Mottram
|
6feebd6aa2
|
Include host in headers
|
2019-07-25 10:13:02 +01:00 |
Bob Mottram
|
79bc4a5224
|
Start of login screen
|
2019-07-24 23:38:42 +01:00 |
Bob Mottram
|
62d596bade
|
Show timeline banner
|
2019-07-24 13:02:28 +01:00 |
Bob Mottram
|
6bea6ceb4b
|
Single css file
|
2019-07-24 12:03:56 +01:00 |
Bob Mottram
|
55ccd4cb97
|
Showing shares on profile screen
|
2019-07-24 10:53:07 +01:00 |
Bob Mottram
|
f9616d6474
|
Undo shared items
|
2019-07-23 22:14:16 +01:00 |
Bob Mottram
|
d3598b861a
|
Uploading shared items
|
2019-07-23 21:00:17 +01:00 |
Bob Mottram
|
f88ed8d787
|
Upload of shared item images
|
2019-07-23 20:02:26 +01:00 |
Bob Mottram
|
643ca568bc
|
Functions for shared items
|
2019-07-23 13:33:09 +01:00 |
Bob Mottram
|
84de304df0
|
Show skills on profile screen
|
2019-07-22 21:01:46 +01:00 |
Bob Mottram
|
88cbc74df2
|
Show roles on profile screen
|
2019-07-22 18:21:45 +01:00 |
Bob Mottram
|
e94d55a768
|
Comments
|
2019-07-22 16:14:39 +01:00 |
Bob Mottram
|
e4503b7143
|
Look up avatars for profile screen
|
2019-07-22 15:09:21 +01:00 |
Bob Mottram
|
ed6a98af07
|
Followers and following on profile screen
|
2019-07-22 12:44:31 +01:00 |
Bob Mottram
|
82676d5c92
|
Avoid busy conflicts when grabbing media
|
2019-07-22 10:52:43 +01:00 |
Bob Mottram
|
d0693db8ba
|
More generic profile page
|
2019-07-22 10:38:02 +01:00 |
Bob Mottram
|
0f448553ab
|
Showing posts on profile
|
2019-07-21 23:38:44 +01:00 |
Bob Mottram
|
2b3a947265
|
Initial html timeline
|
2019-07-21 10:09:28 +01:00 |
Bob Mottram
|
2b02a1a442
|
Begin on a web interface
|
2019-07-20 22:13:36 +01:00 |
Bob Mottram
|
0350b9e33b
|
Fix daemon
|
2019-07-20 19:50:02 +01:00 |
Bob Mottram
|
0f28decf20
|
jrd according to webfinger spec
|
2019-07-19 17:11:09 +01:00 |
Bob Mottram
|
ed1c08e0fe
|
ld+json
|
2019-07-19 16:53:25 +01:00 |
Bob Mottram
|
f229f3bf35
|
More debug
|
2019-07-19 16:22:04 +01:00 |
Bob Mottram
|
1551c20420
|
Back to no port number on webfinger acct
|
2019-07-19 15:41:32 +01:00 |
Bob Mottram
|
bc93a289f8
|
Webfinger debug
|
2019-07-19 15:19:36 +01:00 |
Bob Mottram
|
8411b44721
|
Include port in webfinger
|
2019-07-19 14:32:58 +01:00 |
Bob Mottram
|
81b0207c2a
|
Setting availability via c2s
|
2019-07-19 12:38:37 +01:00 |
Bob Mottram
|
770edd001d
|
Notes on skills
|
2019-07-19 11:01:24 +01:00 |
Bob Mottram
|
cb58d62bcc
|
Only show a limited subset of follows/followers to unauthorized viewers
|
2019-07-19 09:40:51 +01:00 |
Bob Mottram
|
958e76ea89
|
Functions for role delegation
|
2019-07-18 16:09:23 +01:00 |
Bob Mottram
|
5f58b0f02e
|
First account gets admin status
|
2019-07-18 14:10:26 +01:00 |
Bob Mottram
|
982ab616d9
|
Fix ports on post filenames
|
2019-07-18 12:35:48 +01:00 |
Bob Mottram
|
ce5488d9fd
|
c2s blocking
|
2019-07-17 22:40:56 +01:00 |
Bob Mottram
|
c34c0a8d8b
|
Undoing of likes view c2s
|
2019-07-17 20:55:24 +01:00 |
Bob Mottram
|
5ff4c121ce
|
Allow deletes in tests
|
2019-07-17 20:31:52 +01:00 |
Bob Mottram
|
58c213256c
|
Don't allow federated deletes by default
|
2019-07-17 19:13:45 +01:00 |
Bob Mottram
|
787b15f227
|
Prohibit deletions of posts not owned by the deletion requester
|
2019-07-17 19:05:07 +01:00 |
Bob Mottram
|
80bdb7a38b
|
Allow authenticated deletion
|
2019-07-17 18:58:08 +01:00 |
Bob Mottram
|
185b9c97c1
|
Option to not accept deletions
|
2019-07-17 18:44:26 +01:00 |
Bob Mottram
|
27908a5fad
|
Test for post deletion
|
2019-07-17 18:16:48 +01:00 |
Bob Mottram
|
c55b5c9e15
|
unfollowing functions
|
2019-07-17 11:34:00 +01:00 |
Bob Mottram
|
f02839e32f
|
Test follow via c2s
|
2019-07-16 22:38:06 +01:00 |
Bob Mottram
|
a819c4ae57
|
Test for announce via c2s
|
2019-07-16 20:07:45 +01:00 |
Bob Mottram
|
8ab84efbbf
|
404 if media isn't found
|
2019-07-16 17:10:52 +01:00 |
Bob Mottram
|
d7598125cf
|
Move images to the media directory
|
2019-07-16 17:08:21 +01:00 |
Bob Mottram
|
c99828c264
|
Uploading images via c2s
|
2019-07-16 15:23:06 +01:00 |
Bob Mottram
|
700d3cf2f0
|
debug
|
2019-07-16 11:20:03 +01:00 |
Bob Mottram
|
a98facaf33
|
Fixing c2s
|
2019-07-16 11:19:04 +01:00 |
Bob Mottram
|
a55165c922
|
c2s sending to named addresses
|
2019-07-15 19:20:52 +01:00 |
Bob Mottram
|
c6a93e624d
|
c2s post distribution to followers
|
2019-07-15 18:22:51 +01:00 |
Bob Mottram
|
036e9c53b7
|
Service unavailable status
|
2019-07-15 13:28:41 +01:00 |
Bob Mottram
|
1f2a3dbb42
|
Limit inbox queue length
|
2019-07-15 13:27:26 +01:00 |
Bob Mottram
|
4a1b57a661
|
Make initial quotas high - one every ten seconds
|
2019-07-15 11:27:53 +01:00 |
Bob Mottram
|
ce6a60e66e
|
Add quotas
|
2019-07-15 11:22:19 +01:00 |
Bob Mottram
|
e1a6528307
|
Tidying
|
2019-07-14 17:57:06 +01:00 |
Bob Mottram
|
b5b2d74966
|
Check capabilities for shared inbox when getting inbox feed
|
2019-07-14 12:15:28 +01:00 |
Bob Mottram
|
7105c0cd79
|
Maximum replies per post
|
2019-07-13 22:00:12 +01:00 |
Bob Mottram
|
7ed36fa9d5
|
page ending
|
2019-07-13 21:23:42 +01:00 |
Bob Mottram
|
ce9f403f92
|
Checks on public status for viewed replies
|
2019-07-13 21:16:07 +01:00 |
Bob Mottram
|
08a16714c0
|
Handle domain
|
2019-07-13 20:34:03 +01:00 |
Bob Mottram
|
d2fcb37dd9
|
Handle displaying replies
|
2019-07-13 20:28:14 +01:00 |
Bob Mottram
|
a44e9f5a3c
|
Tidying
|
2019-07-13 10:37:17 +01:00 |
Bob Mottram
|
72250edb29
|
Extra options
|
2019-07-13 10:22:25 +01:00 |
Bob Mottram
|
48ee0cfd9f
|
GET media
|
2019-07-12 20:33:34 +01:00 |
Bob Mottram
|
050ce03ad0
|
Random token
|
2019-07-12 17:09:25 +01:00 |
Bob Mottram
|
de9f50b5ad
|
GET avatar
|
2019-07-12 17:03:01 +01:00 |
Bob Mottram
|
29a4af00dd
|
Don't show likes to unauthorized viewers
|
2019-07-12 12:20:59 +01:00 |
Bob Mottram
|
0d96aaacb7
|
Tidying
|
2019-07-12 12:05:43 +01:00 |
Bob Mottram
|
94a2e495b6
|
Slightly more verbose
|
2019-07-12 10:52:06 +01:00 |
Bob Mottram
|
c301f45b33
|
Move shared inbox account into daemon
|
2019-07-11 13:29:31 +01:00 |
Bob Mottram
|
a671ceb952
|
Etra default capabilities
|
2019-07-09 19:11:23 +01:00 |
Bob Mottram
|
21a72b59fc
|
Set default capabilities with options
|
2019-07-09 18:54:08 +01:00 |
Bob Mottram
|
76e8167ce7
|
Updating of capabilities
|
2019-07-09 15:20:23 +01:00 |
Bob Mottram
|
db68b34cc5
|
Capability on post is a list
|
2019-07-08 14:30:04 +01:00 |
Bob Mottram
|
356877b98c
|
Test for strict capabilities enforcement
|
2019-07-07 20:25:38 +01:00 |
Bob Mottram
|
b9ebf425b1
|
Option to strictly enforce object capabilities
|
2019-07-07 18:47:37 +01:00 |
Bob Mottram
|
e9cf9dfc27
|
Add capabilities to follow requests
|
2019-07-07 12:53:32 +01:00 |
Bob Mottram
|
331d7c53bf
|
Secondary format for individual posts
|
2019-07-06 22:33:46 +01:00 |
Bob Mottram
|
37568d5ed8
|
GET individual posts
|
2019-07-06 22:24:47 +01:00 |
Bob Mottram
|
3a6fe719a9
|
Reduce some line lengths
|
2019-07-06 18:00:22 +01:00 |
Bob Mottram
|
ef3a951452
|
Test for follow request
|
2019-07-06 14:49:25 +01:00 |
Bob Mottram
|
c9d62e8361
|
Adding capabilities to posts
|
2019-07-06 11:33:57 +01:00 |
Bob Mottram
|
edaf2cb8e6
|
More generic postPath
|
2019-07-05 23:13:20 +01:00 |
Bob Mottram
|
54ff42d078
|
Add a capabilities account to sign requests
|
2019-07-05 22:24:16 +01:00 |
Bob Mottram
|
d257b59c3a
|
Send accept message after follow
|
2019-07-05 19:57:19 +01:00 |
Bob Mottram
|
f805786f9a
|
Tidying
|
2019-07-05 17:13:31 +01:00 |
Bob Mottram
|
bfbf6ec625
|
Shared inbox may be named 'inbox'
|
2019-07-05 16:10:21 +01:00 |
Bob Mottram
|
cdddf40b26
|
Move shared inbox posts to people who follow
|
2019-07-05 14:26:54 +01:00 |
Bob Mottram
|
359e4794c9
|
self
|
2019-07-05 12:41:09 +01:00 |
Bob Mottram
|
509ba6b840
|
Create shared inbox on start of daemon
|
2019-07-05 12:27:18 +01:00 |
Bob Mottram
|
810dad25da
|
Check shared inbox path
|
2019-07-05 11:24:20 +01:00 |
Bob Mottram
|
f2d5f51635
|
Prepare for shared inbox
|
2019-07-05 11:21:10 +01:00 |
Bob Mottram
|
8d02e8fdc2
|
Fix network test
|
2019-07-04 21:25:19 +01:00 |
Bob Mottram
|
3a8801e544
|
Move function
|
2019-07-04 20:34:28 +01:00 |
Bob Mottram
|
e500d32b15
|
Reserved usernames
|
2019-07-04 18:56:25 +01:00 |
Bob Mottram
|
b321baf307
|
Generic in/outbox functions
|
2019-07-04 17:24:23 +01:00 |
Bob Mottram
|
e12f0994cf
|
Fixing public key lookup
|
2019-07-04 15:36:29 +01:00 |
Bob Mottram
|
08134954bc
|
inbox queue
|
2019-07-04 13:23:53 +01:00 |
Bob Mottram
|
640cf71416
|
Save posts to inbox to a queue
|
2019-07-04 11:02:56 +01:00 |
Bob Mottram
|
50a2f95c9c
|
outbox post authentication
|
2019-07-04 10:00:53 +01:00 |
Bob Mottram
|
c4797d3de2
|
Authentication debug
|
2019-07-04 09:56:15 +01:00 |
Bob Mottram
|
6602d0b78e
|
Create id of object
|
2019-07-03 23:59:56 +01:00 |
Bob Mottram
|
4ef93d01c5
|
Allow for other outbox post types
|
2019-07-03 23:44:03 +01:00 |
Bob Mottram
|
d3128fe91d
|
Client to server posts overwrite some parameters
|
2019-07-03 23:16:03 +01:00 |
Bob Mottram
|
fde8fd4dd9
|
create wrapping
|
2019-07-03 22:37:46 +01:00 |
Bob Mottram
|
8462c65e8f
|
method not allowed
|
2019-07-03 21:32:30 +01:00 |
Bob Mottram
|
503c423a18
|
Outbox post authorization is on particular nicknames
|
2019-07-03 21:03:38 +01:00 |
Bob Mottram
|
f2c596ee2d
|
Authorization for inbox access
|
2019-07-03 20:32:07 +01:00 |
Bob Mottram
|
3aaf7df0bf
|
Extraneous debug
|
2019-07-03 20:19:20 +01:00 |
Bob Mottram
|
8ad7ee5ff2
|
Consistent utf string
|
2019-07-03 20:15:42 +01:00 |
Bob Mottram
|
407f3e702b
|
unathorized code
|
2019-07-03 20:02:36 +01:00 |
Bob Mottram
|
86aaff3c84
|
Option to use dat urls
|
2019-07-03 20:00:03 +01:00 |
Bob Mottram
|
be9c2d68d2
|
Tests for basic authentication
|
2019-07-03 19:24:44 +01:00 |
Bob Mottram
|
be525dff0a
|
Debug option
|
2019-07-03 17:14:45 +01:00 |