Dessalines
|
7823d6a0d9
|
Version v0.3.0.13
|
2019-11-02 00:22:27 -07:00 |
|
Dessalines
|
1fab462c71
|
Merge branch 'master' into email
|
2019-11-01 23:43:35 -07:00 |
|
Dessalines
|
b89d6305ba
|
Password reset mostly working.
|
2019-11-01 23:41:57 -07:00 |
|
Dessalines
|
4c017966aa
|
Version v0.3.0.12
|
2019-11-01 11:20:12 -07:00 |
|
Dessalines
|
2f94d814b3
|
Version v0.3.0.11
|
2019-10-31 21:06:26 -07:00 |
|
Dessalines
|
a8dbd5f3b2
|
Version v0.3.0.10
|
2019-10-31 20:09:33 -07:00 |
|
Dessalines
|
7100d4d1ef
|
Halfway done with email, not fully working yet.
|
2019-10-29 20:35:39 -07:00 |
|
Dessalines
|
68e98e27cf
|
Version v0.3.0.8
|
2019-10-21 17:00:59 -07:00 |
|
Dessalines
|
bffd65720d
|
Adding vaporwave theme.
- Fixes #315
|
2019-10-21 16:49:13 -07:00 |
|
Dessalines
|
0b07834a43
|
Minor formatting issue.
|
2019-10-21 12:52:51 -07:00 |
|
Matteo Guglielmetti
|
0c6024c5f1
|
Adds last translations, updates README with percentages
|
2019-10-21 09:02:20 +02:00 |
|
Matteo Guglielmetti
|
2a94a6c8e9
|
Merge branch 'master' into master
|
2019-10-21 08:50:38 +02:00 |
|
Matteo Guglielmetti
|
623c8c7a5f
|
Revert "Adds i18n to Prev and Next buttons in modlog"
This reverts commit 272361ea5f .
|
2019-10-21 08:42:17 +02:00 |
|
Dessalines
|
d3f34bb24a
|
Version v0.3.0.7
|
2019-10-20 22:26:50 -07:00 |
|
Dessalines
|
c21b0b74f7
|
Adding shorter websocket reconnect.
- Fixes #314
|
2019-10-20 22:19:22 -07:00 |
|
Dessalines
|
b3346d8cfb
|
Adding default sort / filter into user settings.
- Fixes #295
|
2019-10-20 21:21:54 -07:00 |
|
Dessalines
|
72e90fdc4c
|
Externalize into sort-select component.
- Fixes #311
|
2019-10-20 17:49:13 -07:00 |
|
Dessalines
|
258f6305ca
|
Version v0.3.0.6
|
2019-10-19 18:21:52 -07:00 |
|
Dessalines
|
2d5f13ae67
|
Adding username mentions / tagging from comments.
- Fixes #293
|
2019-10-19 17:46:29 -07:00 |
|
Dessalines
|
d298c82a03
|
Version v0.3.0.5
|
2019-10-18 17:31:38 -07:00 |
|
Dessalines
|
97e21f6fd9
|
Running prettier on code.
- #305 , #309
|
2019-10-18 17:20:27 -07:00 |
|
Dessalines
|
1c62eabe0c
|
Merge branch 'chore/eslint' of https://github.com/zacanger/lemmy into zacanger-chore/eslint
|
2019-10-18 16:49:12 -07:00 |
|
Dessalines
|
47f9e8db20
|
Version v0.3.0.4
|
2019-10-18 15:25:00 -07:00 |
|
Dessalines
|
ce10a3454f
|
Fixing issue with community.tsx.
|
2019-10-18 15:05:50 -07:00 |
|
zacanger
|
12624813b4
|
chore: switch from tslint to eslint
|
2019-10-18 15:56:32 -06:00 |
|
Dessalines
|
27ea8af992
|
Adding sponsors.
|
2019-10-18 13:58:43 -07:00 |
|
Dessalines
|
f140cfa847
|
Version v0.3.0.3
|
2019-10-18 12:14:28 -07:00 |
|
Quentin
|
1189e3f4ad
|
ui: Add missing french translations (#308)
|
2019-10-18 12:10:07 -07:00 |
|
Matteo Guglielmetti
|
272361ea5f
|
Adds i18n to Prev and Next buttons in modlog
|
2019-10-18 10:33:29 +02:00 |
|
Matteo Guglielmetti
|
22a1efc790
|
Italian complete translation
|
2019-10-18 10:10:26 +02:00 |
|
Dessalines
|
f7b558f043
|
Version v0.3.0.2
|
2019-10-17 21:41:19 -07:00 |
|
Dessalines
|
9f5a328186
|
Merge branch 'dev'
|
2019-10-17 21:40:46 -07:00 |
|
Dessalines
|
9c0ece1a67
|
Merge branch 'chore/url' of https://github.com/zacanger/lemmy into zacanger-chore/url
|
2019-10-17 21:26:24 -07:00 |
|
Dessalines
|
69d1301723
|
Make delete account require password.
- Fixes #301
|
2019-10-17 21:25:23 -07:00 |
|
zacanger
|
26ea18ded7
|
revert whitespace changes
|
2019-10-17 21:54:29 -06:00 |
|
Dessalines
|
773020ac9d
|
Don't allow image uploads for non-logged-in users.
- Fixes #297
|
2019-10-17 20:19:20 -07:00 |
|
zacanger
|
5ae00abb2a
|
chore: simplify validUrl fn
|
2019-10-17 19:54:01 -06:00 |
|
xyvs
|
41d1af6fd5
|
Spanish translations (#303)
|
2019-10-17 14:49:39 -07:00 |
|
Dessalines
|
2115d4e0c8
|
Version v0.3.0.1
|
2019-10-16 21:34:00 -07:00 |
|
Dessalines
|
95bc3abf05
|
Merge branch 'dev'
|
2019-10-16 21:30:32 -07:00 |
|
Autom
|
c76ff18861
|
Update sv.ts
Removing comment to myself.
|
2019-10-17 03:09:08 +02:00 |
|
Autom
|
20639e881c
|
Consistant spaces before strings
|
2019-10-17 03:08:24 +02:00 |
|
Autom
|
cc963ce1d7
|
Update sv.ts
Swedish is now up to date with en.ts
|
2019-10-17 03:05:27 +02:00 |
|
Autom
|
80bcabbd03
|
Update sv.ts
Adding the strings listed in the readme.
|
2019-10-17 02:55:58 +02:00 |
|
Dessalines
|
371522681a
|
Use pre tags for view source to preserve newlines.
- Fixes #299
|
2019-10-16 16:09:52 -07:00 |
|
Dessalines
|
e959727d32
|
Version v0.3.0
|
2019-10-15 16:50:51 -07:00 |
|
Dessalines
|
3e16882f8c
|
Adding permanently delete account comments and posts.
- Fixes #285
- Fixes #58
|
2019-10-15 15:09:01 -07:00 |
|
Dessalines
|
272ab3948c
|
Adding 8 different themes.
- Fixes #276
|
2019-10-15 12:21:27 -07:00 |
|
Dessalines
|
62ae25f90d
|
Upping version.
|
2019-10-13 18:01:54 -07:00 |
|
Dessalines
|
fb7f4c3292
|
Adding admin abilities on user pages.
- Fixes #280
|
2019-10-13 17:36:35 -07:00 |
|
Dessalines
|
698cb7745b
|
Upping version.
|
2019-10-13 13:05:18 -07:00 |
|
Dessalines
|
92d7f39c7b
|
Sort removed and deleted comments at the bottom.
- Fixes #279
|
2019-10-13 12:53:41 -07:00 |
|
Dessalines
|
b16d78aaff
|
Auto fetch new posts for front page and communities.
- Fixes #286
|
2019-10-13 12:37:10 -07:00 |
|
Dessalines
|
27f566ed95
|
Upping version.
|
2019-10-12 15:18:49 -07:00 |
|
Dessalines
|
c65197fa9f
|
Stopping autoplay, widening videos to show controls.
- Fixes #250
- Fixes #288
- Fixes #291
|
2019-10-12 15:15:18 -07:00 |
|
Dessalines
|
d6915a09da
|
Upping version.
|
2019-09-19 18:01:56 -07:00 |
|
Dessalines
|
e6192e4562
|
Upping version.
|
2019-09-19 15:53:30 -07:00 |
|
Dessalines
|
6d0ec3dc2e
|
Upping version.
|
2019-09-18 12:10:31 -07:00 |
|
Dessalines
|
fa2c2cbad7
|
Upping version.
|
2019-09-18 12:10:00 -07:00 |
|
Dessalines
|
1a90b2e907
|
Upping version.
|
2019-09-13 09:27:30 -07:00 |
|
Dessalines
|
909628bc34
|
Adding an online user count to main page.
- Fixes #274
|
2019-09-13 09:09:01 -07:00 |
|
Dessalines
|
0b75d46453
|
Add Creator flair for post creator / OPs comments
- Fixes #275
|
2019-09-13 08:37:12 -07:00 |
|
Dessalines
|
8a4319304b
|
Upping version.
|
2019-09-11 17:30:35 -07:00 |
|
Dessalines
|
ccd0934da5
|
Reverting tribute, didnt work for non-dev build.
|
2019-09-11 17:30:25 -07:00 |
|
Dessalines
|
4f08625b5d
|
Upping version.
|
2019-09-11 17:21:22 -07:00 |
|
Dessalines
|
a703dc7839
|
Merge branch 'dev'
|
2019-09-11 17:21:04 -07:00 |
|
Dessalines
|
80e89a24b6
|
Fixing tribute positioning issue, moving recent comments to top.
|
2019-09-11 17:20:57 -07:00 |
|
Dessalines
|
725671c783
|
Merge branch 'dev'
|
2019-09-11 14:13:43 -07:00 |
|
Dessalines
|
2bff0c3d9b
|
Updating es.ts and translation report.
|
2019-09-11 14:13:24 -07:00 |
|
Dessalines
|
221d11bbbe
|
Upping version.
|
2019-09-10 18:28:20 -07:00 |
|
Dessalines
|
1b931ef87f
|
Upping version.
|
2019-09-09 12:58:11 -07:00 |
|
Dessalines
|
b64fe423b8
|
Fix issue with not being able to lock / sticky your own posts.
|
2019-09-09 12:58:04 -07:00 |
|
Dessalines
|
877d8c7e74
|
Upping version.
|
2019-09-08 23:30:31 -07:00 |
|
Dessalines
|
21d55af62d
|
Adding stickied posts.
- Fixes #245
|
2019-09-08 23:14:13 -07:00 |
|
Dessalines
|
0dfe703a34
|
Upping version.
|
2019-09-08 11:34:04 -07:00 |
|
Dessalines
|
7ff1d2c381
|
Upping version.
|
2019-09-08 11:02:21 -07:00 |
|
Dessalines
|
a8da6d37c2
|
Adding view source button for posts and comments.
- Fixes #271
|
2019-09-08 11:00:08 -07:00 |
|
Dessalines
|
ae40c2b08d
|
Upping version.
|
2019-09-08 10:15:40 -07:00 |
|
Dessalines
|
bbbeb5e273
|
Upping version.
|
2019-09-08 09:56:00 -07:00 |
|
Dessalines
|
3444c70313
|
Add image loading indicator.
|
2019-09-08 09:54:53 -07:00 |
|
Dessalines
|
562dbba2bb
|
Upping version.
|
2019-09-07 20:43:33 -07:00 |
|
Dessalines
|
de80db1b96
|
Allow Image uploads through docker pictshare.
- Fixes #210
|
2019-09-07 20:42:01 -07:00 |
|
mlaunois
|
9d926b7755
|
Adding missing French translations
|
2019-09-07 14:47:53 +02:00 |
|
Dessalines
|
77328330df
|
Upping version.
|
2019-09-06 13:10:41 -07:00 |
|
Dessalines
|
7ec74a78c9
|
Upping version.
|
2019-09-06 13:06:57 -07:00 |
|
Dessalines
|
b831979ce3
|
Merge branch 'dev'
|
2019-09-06 13:06:32 -07:00 |
|
Dessalines
|
2db5650619
|
Upping version.
|
2019-09-06 13:04:34 -07:00 |
|
Dessalines
|
be41b7bd54
|
Fix sidebar bug.
|
2019-09-06 13:04:04 -07:00 |
|
Dessalines
|
7778baf051
|
Upping version.
|
2019-09-05 18:39:29 -07:00 |
|
Dessalines
|
accb127827
|
Adding usable search urls
- Fixes #242
|
2019-09-05 18:34:10 -07:00 |
|
Dessalines
|
11fe3436c2
|
Fixing inbox refresh issue.
- Fixes #265
|
2019-09-05 17:55:57 -07:00 |
|
Dessalines
|
1c4b22a7fb
|
Adding ability to do mod action on post creator
- Fixes #248
- Show banned on user comment and user overview. Fixes #264
|
2019-09-05 17:18:48 -07:00 |
|
Dessalines
|
9711917c19
|
Upping version.
|
2019-09-04 22:42:09 -07:00 |
|
Dessalines
|
a66e4a2501
|
Adding emoji-short-name package.
- Fixes #266
|
2019-09-04 15:22:31 -07:00 |
|
Dessalines
|
7066efc340
|
Upping version.
|
2019-09-03 13:18:58 -07:00 |
|
Dessalines
|
d08236506e
|
Upping version.
|
2019-09-02 17:33:35 -07:00 |
|
Dessalines
|
0c4e36aa55
|
Removing markdown-it-emoji from index.html
|
2019-09-02 17:33:09 -07:00 |
|
Dessalines
|
7bf9d274c8
|
Upping version.
|
2019-09-02 16:21:39 -07:00 |
|
Dessalines
|
2f18b9e29f
|
Merge branch 'dev'
|
2019-09-02 16:21:15 -07:00 |
|
Dessalines
|
758b6a2842
|
Making markdown heading font size smaller
- Fixes #258
|
2019-09-02 16:16:08 -07:00 |
|
Dessalines
|
bb64de5381
|
Using a proper twitter emoji list for the definitions.
- Fixes #260
|
2019-09-02 15:55:50 -07:00 |
|
Dessalines
|
22e172a47a
|
Hiding vote bar on comment collapse
- Fixes #259
|
2019-09-02 15:00:49 -07:00 |
|
Dessalines
|
6da6d0b37b
|
Upping version.
|
2019-09-02 10:38:37 -07:00 |
|
Dessalines
|
03f879925e
|
Upping version.
|
2019-08-31 21:14:40 -07:00 |
|
Dessalines
|
c568a83adf
|
Adding preview, image upload, and formatting help to comment and post
forms.
- Fixes #253
|
2019-08-31 21:10:48 -07:00 |
|
Dessalines
|
b6f6cd5c3e
|
Upping version.
|
2019-08-31 09:43:10 -07:00 |
|
Dessalines
|
ab64a27881
|
Switch to Twemoji
- Fixes #257
|
2019-08-31 09:40:42 -07:00 |
|
Dessalines
|
94d61bc6fc
|
Upping version.
|
2019-08-30 17:42:11 -07:00 |
|
Dessalines
|
168a0f61f1
|
Add emoji autocomplete
- Fixes #255
|
2019-08-30 17:40:59 -07:00 |
|
Dessalines
|
13ef254c61
|
Upping version.
|
2019-08-30 15:42:16 -07:00 |
|
Dessalines
|
c51bc9457d
|
Merge branch 'AutomCoding-master' into dev_2
|
2019-08-30 15:35:26 -07:00 |
|
Autom
|
d97e9b8589
|
Update Swedish translations
Will make sv.ts up to date with en.ts.
|
2019-08-30 23:47:15 +02:00 |
|
Dessalines
|
d5c727a991
|
Changing margins.
|
2019-08-30 14:46:35 -07:00 |
|
Dessalines
|
9274348040
|
Changing link aggregator to social media aggregation.
|
2019-08-30 13:03:39 -07:00 |
|
Dessalines
|
18e24d02da
|
Better tribute.
|
2019-08-30 12:34:38 -07:00 |
|
Dessalines
|
2c71e05199
|
Better urls.
|
2019-08-29 21:41:41 -07:00 |
|
Dessalines
|
cd721bbc0b
|
Fixing tribute.
|
2019-08-29 21:38:06 -07:00 |
|
Dessalines
|
eebf6223be
|
Merge branch 'autocomplete' into dev
|
2019-08-29 20:13:37 -07:00 |
|
Dessalines
|
ea87106637
|
Adding support for mentions via tribute.
- Adding mentions in comment textareas for users (@) and communities
(#). Fixes #129
- Removing balloon-css
|
2019-08-29 20:11:29 -07:00 |
|
Dessalines
|
3330889718
|
Add loading indicators.
|
2019-08-29 16:49:58 -07:00 |
|
Dessalines
|
cd17e6c9d7
|
Remove dividing lines again.
|
2019-08-29 16:46:09 -07:00 |
|
Dessalines
|
35961442eb
|
Adding emoji support.
|
2019-08-29 16:14:28 -07:00 |
|
Dessalines
|
8378810e0e
|
Allow admins to add mods and transfer communities
- Fixes #238
|
2019-08-29 15:18:50 -07:00 |
|
Dessalines
|
c6c0fb047d
|
Merge branch 'master' into dev
|
2019-08-29 12:06:39 -07:00 |
|
Dessalines
|
09cd927d21
|
Lightening hr
- Fixes #222
|
2019-08-29 12:06:08 -07:00 |
|
Dessalines
|
63d10f0c37
|
Some additions for Dutch.
|
2019-08-29 11:20:21 -07:00 |
|
Splinter Suidman
|
b96b3e2995
|
Add Dutch translations.
|
2019-08-29 18:36:04 +02:00 |
|
Dessalines
|
d6b405384e
|
Better margins.
|
2019-08-28 21:57:38 -07:00 |
|
Dessalines
|
767a9f03f4
|
Upping version.
|
2019-08-28 21:32:24 -07:00 |
|
Dessalines
|
1c59f06fc8
|
Showing community count on main sidebar
- Fixes #232
|
2019-08-28 21:28:06 -07:00 |
|
Dessalines
|
de3bce3c0f
|
Adding are you sure dialogs for transferring community and site.
- Fixes #241
|
2019-08-28 19:22:50 -07:00 |
|
Dessalines
|
82c89062dd
|
Adding some UI suggestions.
- Adding divider lines in between post listings.
- Increasing button sizes.
- Fixes #222
|
2019-08-28 18:43:51 -07:00 |
|
Dessalines
|
8d64dad2df
|
Upping version.
|
2019-08-26 20:37:31 -07:00 |
|
Dessalines
|
39798d0a23
|
Fixing symbols.
|
2019-08-26 20:37:03 -07:00 |
|
Dessalines
|
d2324c3d23
|
Upping version.
|
2019-08-26 19:39:32 -07:00 |
|
Dessalines
|
0e431a8514
|
Adding extra spanish translations.
|
2019-08-26 19:38:01 -07:00 |
|
Dessalines
|
0a21de8a2b
|
Updating icon.
|
2019-08-26 19:26:07 -07:00 |
|
Dessalines
|
977231c458
|
Adding Esperanto.
- Fixes #240
|
2019-08-26 14:42:53 -07:00 |
|
Dessalines
|
328f1c7751
|
Upping version.
|
2019-08-25 10:59:22 -07:00 |
|
Dessalines
|
e0c7432b0b
|
Upping version.
|
2019-08-25 10:57:05 -07:00 |
|
Dessalines
|
aba55b2b03
|
Refactoring chat sidebar. #237
|
2019-08-25 10:42:10 -07:00 |
|
Dessalines
|
371d3e1009
|
Fixing removing communities.
|
2019-08-25 00:22:46 -07:00 |
|
Dessalines
|
5497269d3b
|
Adding a margin to comment paragraphs.
|
2019-08-24 14:27:25 -07:00 |
|
Dessalines
|
4d9a0695cc
|
Upping version.
|
2019-08-24 00:02:58 -07:00 |
|
Dessalines
|
62b17441a4
|
Fixing post listing rows.
|
2019-08-23 23:58:26 -07:00 |
|
Dessalines
|
3032949f58
|
Widening thumbnails.
|
2019-08-23 23:44:44 -07:00 |
|
Dessalines
|
37ab2bab2e
|
Merge branch 'transfer_community' into dev
|
2019-08-23 20:02:52 -07:00 |
|
Dessalines
|
f89727f1a0
|
Merge branch 'master' into dev
|
2019-08-23 19:59:23 -07:00 |
|
Dessalines
|
1e83aa8c72
|
Adding Community and Site transfer
- Fixes #139
|
2019-08-23 19:40:41 -07:00 |
|
Dessalines
|
addfc72080
|
Add missing by and to translations.
|
2019-08-23 15:55:48 -07:00 |
|
Dessalines
|
89ff4daa6a
|
Upping version.
|
2019-08-22 20:49:56 -07:00 |
|
Dessalines
|
0dc26d41e3
|
Adding spanish translation.
- Fixes #191
|
2019-08-22 18:34:24 -07:00 |
|
Dessalines
|
6d42d114e4
|
Cross posting working.
|
2019-08-22 16:13:26 -07:00 |
|
Dessalines
|
f7ef3fb7f8
|
Merge branch 'dev' into similar_url_search
|
2019-08-22 12:19:39 -07:00 |
|
Dessalines
|
b0f4066c78
|
Don't allow html rendering in markdown parser
- Fixes #229
|
2019-08-22 12:09:17 -07:00 |
|
Dessalines
|
9b8d8d3246
|
cross-posting almost done.
|
2019-08-22 11:46:54 -07:00 |
|
Dessalines
|
9b558611b4
|
View where a URL has been cross-posted to in the past
- This shows when creating a post, or when viewing a post.
- Fixes #131
|
2019-08-21 22:17:15 -07:00 |
|
Dessalines
|
2c895c355d
|
Adding new favicon.
- Fixes #225
|
2019-08-21 20:59:54 -07:00 |
|
Dessalines
|
c275c50b6f
|
Fix inferno link.
|
2019-08-20 17:05:57 -07:00 |
|
Dessalines
|
dcef1bbd7c
|
Merge branch 'dev'
|
2019-08-20 14:48:48 -07:00 |
|
Dessalines
|
5dc8da1cae
|
Adding Monero sponsor link
- Fixes #224
|
2019-08-20 14:47:19 -07:00 |
|
Dessalines
|
9c8cc659fc
|
Removing navbar toggler border.
|
2019-08-20 14:40:51 -07:00 |
|
Dessalines
|
1fa2cfce51
|
Separate sidebar.
|
2019-08-19 21:45:06 -07:00 |
|
Dessalines
|
dec4661dd5
|
Adding extra margin.
|
2019-08-19 20:16:34 -07:00 |
|
Dessalines
|
21a7243491
|
Adding cards for sidebars in UI.
|
2019-08-19 19:37:32 -07:00 |
|
Dessalines
|
1b72e0c0e3
|
Fixing comment buttons now.
|
2019-08-19 15:39:45 -07:00 |
|
Dessalines
|
10917489fc
|
Try changing votes to buttons.
|
2019-08-19 15:32:32 -07:00 |
|
Dessalines
|
aae235279e
|
Fixing logout after browser close.
|
2019-08-19 15:22:05 -07:00 |
|
Dessalines
|
0c89ea980c
|
Upping version.
|
2019-08-19 15:06:38 -07:00 |
|
Dessalines
|
34ab142b5e
|
Merge branch 'master' of https://github.com/AutomCoding/lemmy into AutomCoding-master
|
2019-08-19 14:56:06 -07:00 |
|
Dessalines
|
0acb08b5e7
|
Merge branch 'add-more-translations-de' of https://github.com/matthiasbeyer/lemmy into matthiasbeyer-add-more-translations-de
|
2019-08-19 14:51:17 -07:00 |
|
Dessalines
|
ceda1e88e7
|
Merge branch 'master' into dev
|
2019-08-19 14:29:52 -07:00 |
|
Dessalines
|
9c6c490b20
|
Adding russian locales.
|
2019-08-19 14:29:28 -07:00 |
|
Dessalines
|
7805246b87
|
Upping title size again.
|
2019-08-19 14:13:15 -07:00 |
|
Autom
|
42ab3928ea
|
Missing space
|
2019-08-19 00:11:35 +02:00 |
|
digitalkiller
|
266597a6a9
|
Added a Russian localization
|
2019-08-18 22:02:34 +05:00 |
|
|
42ba61c2a1
|
Add missing translations
|
2019-08-18 11:18:16 +02:00 |
|
Autom
|
2958cb241d
|
Fix character escaping
|
2019-08-18 08:08:54 +02:00 |
|
Dessalines
|
cd0733e014
|
fixing vote bar
|
2019-08-17 22:11:03 -07:00 |
|
Dessalines
|
33d42ed408
|
more styles 2.
|
2019-08-17 22:04:17 -07:00 |
|
Dessalines
|
8cc653b0c0
|
more styles.
|
2019-08-17 22:00:11 -07:00 |
|
Dessalines
|
09aaa13a41
|
Fixing style 2.
|
2019-08-17 21:55:06 -07:00 |
|
Dessalines
|
3861a71e14
|
Fixing style.
|
2019-08-17 21:47:25 -07:00 |
|
Dessalines
|
3883b15ea9
|
Adding better title wrap.
|
2019-08-17 21:41:55 -07:00 |
|
Dessalines
|
32dbb9ec4b
|
Better offsets
|
2019-08-17 19:31:32 -07:00 |
|
Dessalines
|
0331c80c8b
|
Offsetting image.
|
2019-08-17 19:17:12 -07:00 |
|
Dessalines
|
859505d4c8
|
fixed again.
|
2019-08-17 19:12:48 -07:00 |
|
Dessalines
|
888fa32783
|
Trying some extra spacing.
|
2019-08-17 18:59:59 -07:00 |
|
Dessalines
|
d0a9cef72e
|
Adding more settings for german.
|
2019-08-17 13:32:59 -07:00 |
|
Dessalines
|
43120f5905
|
Merge branch 'de' of https://github.com/kpcyrd/lemmy into kpcyrd-de
|
2019-08-17 13:27:45 -07:00 |
|
Dessalines
|
4b68e63f94
|
Needs to go below image expander
|
2019-08-17 13:18:25 -07:00 |
|
kpcyrd
|
95dcf3b1d9
|
Add basic German translations
|
2019-08-17 22:00:33 +02:00 |
|
Dessalines
|
99013606c0
|
Fixing vote margins.
|
2019-08-17 12:46:32 -07:00 |
|
Dessalines
|
6f28c17c1a
|
Fixing navbar icon position.
|
2019-08-17 12:15:53 -07:00 |
|
Dessalines
|
b0c9556f47
|
Fixing up index.html
|
2019-08-17 12:11:22 -07:00 |
|
Dessalines
|
62854cdf39
|
Fix moment locale issue.
- Fixes #206
|
2019-08-17 10:22:38 -07:00 |
|
Dessalines
|
ca93aceefb
|
Upping version.
|
2019-08-16 19:34:23 -07:00 |
|
Dessalines
|
c27dab08ab
|
Fixing create post bug.
- Fixes #202
|
2019-08-16 18:46:39 -07:00 |
|
Dessalines
|
382c79eedc
|
Adding new icon by Andy Cuccaro.
- Fixes #203
|
2019-08-16 17:36:35 -07:00 |
|
Dessalines
|
c4a9fc45da
|
Merge branch 'master' into dev
|
2019-08-15 14:22:19 -07:00 |
|
Dessalines
|
134a21158e
|
Squashed commit of the following:
commit 3008b45a89
Author: Dessalines <happydooby@gmail.com>
Date: Thu Aug 15 14:11:02 2019 -0700
Adding moment translation, and to i18next.ts file.
commit 620be4ecd8
Author: Autom <40275136+AutomCoding@users.noreply.github.com>
Date: Thu Aug 15 19:08:57 2019 +0200
Minor tweaks
Line 74: Change grammatical gender to neutrum for undefined target.
Line 126: Possibly a more accurate translation.
commit e053040c58
Author: Autom <40275136+AutomCoding@users.noreply.github.com>
Date: Thu Aug 15 18:55:32 2019 +0200
Translate remaining Swedish
commit b126b59e15
Author: Autom <40275136+AutomCoding@users.noreply.github.com>
Date: Thu Aug 15 18:38:20 2019 +0200
Typo (missing apostrophe in contraction)
commit 50a0c6b590
Author: Autom <40275136+AutomCoding@users.noreply.github.com>
Date: Thu Aug 15 18:36:22 2019 +0200
Create sv.ts
First half translated
|
2019-08-15 14:11:22 -07:00 |
|
Dessalines
|
6a761165bb
|
Squashed commit of the following:
commit ecd6c5a2f4
Author: Dessalines <happydooby@gmail.com>
Date: Tue Aug 13 19:49:38 2019 -0700
Adding some docs
commit 3babd09aff
Author: Dessalines <happydooby@gmail.com>
Date: Tue Aug 13 19:28:46 2019 -0700
Adding save user settings
commit 6e8da9cc9e
Merge: 3246d5d c148eef
Author: Dessalines <happydooby@gmail.com>
Date: Tue Aug 13 17:26:25 2019 -0700
Merge branch 'dev' into nsfw
commit b3d4a5c4ce
Author: Dessalines <happydooby@gmail.com>
Date: Sun Aug 11 20:55:09 2019 -0700
nsfw mostly done, except for settings page.
|
2019-08-13 19:52:43 -07:00 |
|
Dessalines
|
7e543cecbe
|
Adding the imports.
|
2019-08-10 11:33:54 -07:00 |
|
Dessalines
|
6b8dfb9621
|
Merge branch 'patch-1' of https://github.com/finkiki/lemmy into finkiki-patch-1
|
2019-08-10 11:30:05 -07:00 |
|
Dessalines
|
98bce112a7
|
Fixing locales in fuse. Coercing zh to zh-cn for moment.
|
2019-08-10 11:26:28 -07:00 |
|
Dessalines
|
b87593b5ec
|
Merge branch 'i18n-zh' of https://github.com/tqcenglish/lemmy into tqcenglish-i18n-zh
|
2019-08-10 10:38:40 -07:00 |
|
Dessalines
|
b40d029945
|
Adding support for community and user searching.
- Fixes #130
|
2019-08-10 10:32:06 -07:00 |
|
tqcenglish
|
b18cc49d58
|
fix comment error
|
2019-08-11 00:43:36 +08:00 |
|
tqcenglish
|
74a482992f
|
i18n zh
|
2019-08-10 23:51:21 +08:00 |
|
Popol
|
45e28f8bf5
|
Update fr.ts
\\\
|
2019-08-10 14:29:36 +02:00 |
|
Popol
|
45846f2dbf
|
Create fr.ts
French translation. I hope to see it online soon ! :-)
|
2019-08-10 14:15:39 +02:00 |
|
Dessalines
|
2d2995ba3f
|
Forgot to add subscribed.
|
2019-08-09 17:41:24 -07:00 |
|
Dessalines
|
1424417d90
|
Upping version.
|
2019-08-09 17:36:35 -07:00 |
|
Dessalines
|
93ae1a18c2
|
Making a few internationalization fixes.
|
2019-08-09 17:15:27 -07:00 |
|
Dessalines
|
4239ead854
|
Adding back end translations.
|
2019-08-09 16:51:47 -07:00 |
|
Dessalines
|
e312f0f6c4
|
Added a few more translations.
|
2019-08-09 15:53:10 -07:00 |
|
Dessalines
|
6304417b3b
|
Second front end pass.
|
2019-08-09 15:52:32 -07:00 |
|
Dessalines
|
093bc00ff7
|
Localization testing mostly done.
|
2019-08-08 22:09:36 -07:00 |
|
Dessalines
|
50ee0e9d82
|
i18n translations first pass.
|
2019-08-08 18:58:04 -07:00 |
|
Dessalines
|
8646347bc3
|
Main done.
|
2019-08-07 12:12:53 -07:00 |
|
Dessalines
|
9fe4f11b92
|
Starting to work on internationalization
|
2019-08-07 11:01:26 -07:00 |
|
Dessalines
|
641d1b0155
|
Still not working
|
2019-08-06 11:23:34 -07:00 |
|
Dessalines
|
2db3b84b11
|
Adding a debounce.
|
2019-08-03 13:26:20 -07:00 |
|
Dessalines
|
08d7695ef5
|
Adding similar post searching before creating post.
- Fixes #185.
- Offsetting create post and community columns.
|
2019-07-28 18:57:09 -07:00 |
|
Dessalines
|
1b01a76583
|
Maybe #183
|
2019-07-22 20:15:00 -07:00 |
|
Dessalines
|
d300ae9de0
|
Adding collapse comments
- Fixes #179
|
2019-07-15 22:56:46 -07:00 |
|
Dessalines
|
1dc192524d
|
Switching to BrowserRouter.
- Fixes #178.
- #176
|
2019-07-14 19:43:31 -07:00 |
|
Dessalines
|
d3f7a6c1d4
|
Formatting fixes.
|
2019-07-13 14:14:59 -07:00 |
|
Dessalines
|
9a66eb6c9a
|
Fix parenthesis
|
2019-06-19 13:36:05 -07:00 |
|
Dessalines
|
1dcc7d3bc2
|
Version bump.
|
2019-06-11 18:41:48 -07:00 |
|
Dessalines
|
7865843106
|
Fixing GetSite
- Fixes #171
|
2019-06-11 18:41:01 -07:00 |
|
Dessalines
|
6f113831cc
|
Version bump
|
2019-06-02 19:46:30 -07:00 |
|
Dessalines
|
19c106d3df
|
Fix page titles for custom site name
- Fixes #113
|
2019-06-02 18:35:46 -07:00 |
|
Dessalines
|
b65a3693d4
|
Fixing communities sorting
- Fixes #159
|
2019-06-02 09:41:57 -07:00 |
|
Dessalines
|
2109016614
|
Disable create post button when community is deleted or removed.
- Fixes #167
|
2019-06-01 15:46:40 -07:00 |
|
Dessalines
|
2cbd4c9678
|
Fix site-form cancel button.
- Fixes #164
|
2019-06-01 15:12:10 -07:00 |
|
Dessalines
|
75686374a2
|
Adding emoji support
- Fixes #163
- Bad because it doubles the size of the codebase, and it breaks hot
module reloading. Decide later on merge.
|
2019-06-01 11:58:14 -07:00 |
|
Dessalines
|
829fd2fdb0
|
Merge branch 'use-local-assets' of https://github.com/Perflyst/lemmy into Perflyst-use-local-assets
|
2019-06-01 10:30:15 -07:00 |
|
perflyst
|
6c687b93d4
|
Use local assets instead of cloudflare cdn
|
2019-05-27 13:39:05 +02:00 |
|
Dessalines
|
0af79bf4ef
|
Merge branch 'dev'
|
2019-05-19 11:05:44 -07:00 |
|
Dessalines
|
25f262d639
|
Moving create post to below unsubscribe.
|
2019-05-19 09:34:27 -07:00 |
|
Dessalines
|
d350f57e00
|
Mark as read if viewing link.
- Fixes #154. #153
|
2019-05-19 09:15:08 -07:00 |
|
Dessalines
|
d2187efa1d
|
Adding browser notifications.
- Fixes #153
|
2019-05-18 16:41:22 -07:00 |
|
Dessalines
|
b6e6e7df45
|
Updating broken bitcoin link.
|
2019-05-17 08:32:07 -07:00 |
|
Dessalines
|
4df4a10daa
|
Version bump.
|
2019-05-15 09:47:23 -07:00 |
|
Dessalines
|
db63212fe1
|
Removing need for spam_timer
|
2019-05-15 09:32:33 -07:00 |
|
Dessalines
|
ff170e1666
|
Adding API to footer
|
2019-05-15 09:12:54 -07:00 |
|
Dessalines
|
296421a888
|
Adding API docs for app developers.
- Fixes #99.
|
2019-05-15 09:04:05 -07:00 |
|
Dessalines
|
26af8fd4a6
|
Adding create community and post buttons from sidebar.
- Fixes #148
|
2019-05-08 09:07:34 -07:00 |
|
Dessalines
|
b3ce400da0
|
Better columns
|
2019-05-06 09:26:21 -07:00 |
|
Dessalines
|
24c9f36146
|
Softer white background.
|
2019-05-05 15:47:35 -07:00 |
|
Dessalines
|
83f821a059
|
Better image click
|
2019-05-05 14:50:17 -07:00 |
|
Dessalines
|
124b84787f
|
Version bump
|
2019-05-05 10:02:16 -07:00 |
|
Dessalines
|
da1d7178a7
|
Fix scrolling issue on refetch.
|
2019-05-02 15:16:38 -07:00 |
|
Dessalines
|
abe31e9f17
|
Externalizing JWT token
|
2019-05-02 09:55:29 -07:00 |
|
Dessalines
|
1775eb7d5f
|
Version bump
|
2019-05-01 22:29:14 -07:00 |
|
Dessalines
|
1eb587d233
|
Reworking some UI. Adding proper trending communities with hot rank.
- Breaking out subscribed and all into radios. Fixes #142
|
2019-05-01 22:26:31 -07:00 |
|
Dessalines
|
c54405eeec
|
Adding a register, community, and forum rate limit, based on IP.
- Fixes #124
|
2019-05-01 15:44:39 -07:00 |
|
Dessalines
|
f903c4ab2b
|
Sponsor
|
2019-05-01 08:27:54 -07:00 |
|
Dessalines
|
2b2ef53dd4
|
Version bump
|
2019-04-30 08:22:46 -07:00 |
|
Dessalines
|
939000fc05
|
Custom site name.
- Fixes #113
|
2019-04-30 08:19:00 -07:00 |
|
Dessalines
|
37f2a1651e
|
format fix
|
2019-04-30 07:55:19 -07:00 |
|
Dessalines
|
7564143003
|
Version bump
|
2019-04-30 07:47:31 -07:00 |
|
Dessalines
|
23b9774a85
|
Adding simple suggested post title from textance.
- Fixes #112
|
2019-04-30 07:45:50 -07:00 |
|
Dessalines
|
adc2c3359a
|
Adding paging on communities.
|
2019-04-30 06:49:01 -07:00 |
|
Dessalines
|
10535c80ce
|
Merge branch 'master' into dev
|
2019-04-29 21:10:01 -07:00 |
|
Dessalines
|
679ec011db
|
Getting your votes on a user details page.
|
2019-04-29 14:19:00 -07:00 |
|
Anthony Ettinger
|
d9c2204b3d
|
remove changes
|
2019-04-29 13:53:07 -07:00 |
|
Anthony Ettinger
|
1c43852ef8
|
add apple-touch-icon
|
2019-04-29 13:43:26 -07:00 |
|
Dessalines
|
9570c21dca
|
Adding a max character of 10k to textareas
|
2019-04-29 12:42:22 -07:00 |
|
Anthony Ettinger
|
31c276b577
|
fix apple ios icon. add gitignore
|
2019-04-29 12:31:51 -07:00 |
|
Dessalines
|
ee99deceb1
|
Adding proper deletes for Post, Community, and Comments.
- Fixes #132
- Fixes #108
|
2019-04-29 12:14:54 -07:00 |
|
Dessalines
|
6ba2dde9f4
|
Adding support for spoilers.
- Fixes #104
example :
```
::: spoiler hidden stuff
*a bunch of spoilers here*
:::
```
|
2019-04-29 10:16:43 -07:00 |
|
Dessalines
|
e97d3206d6
|
Adding mark all as read
- Fixes #107
|
2019-04-29 09:51:13 -07:00 |
|
Dessalines
|
d0099b4941
|
Auto-select current community if creating a post from the community
page.
Fixes #133
|
2019-04-29 09:07:41 -07:00 |
|
Dessalines
|
b0a6fefcf9
|
Changing from forum to community
- Fixes #121
|
2019-04-28 19:05:11 -07:00 |
|
Dessalines
|
fe614536ad
|
Fix
|
2019-04-28 18:31:20 -07:00 |
|
Dessalines
|
42c92bb6d1
|
Switching back to hash router
|
2019-04-28 18:30:52 -07:00 |
|
Dessalines
|
dbdf045c88
|
Fixing spam timer on setup.
- Fixes #116
|
2019-04-28 17:50:31 -07:00 |
|
Dessalines
|
63d0e623ac
|
Trying browserrouter
|
2019-04-28 17:46:23 -07:00 |
|
Dessalines
|
1d0c5bfda7
|
Adding paging to user details
|
2019-04-28 17:41:24 -07:00 |
|
Dessalines
|
ff5e884b45
|
Adding better community and main page routing, with sorting and type in url.
|
2019-04-28 17:19:04 -07:00 |
|
Dessalines
|
e3651e76bb
|
Spam
|
2019-04-26 09:21:20 -07:00 |
|
Dessalines
|
aff41afa19
|
Spam
|
2019-04-26 09:11:04 -07:00 |
|
Dessalines
|
74af5ef871
|
Spam
|
2019-04-26 08:53:45 -07:00 |
|
Dessalines
|
170d1b6f0a
|
Spam
|
2019-04-26 08:31:23 -07:00 |
|
Dessalines
|
018cbe1fee
|
Fixing rust warning.
- Fixes #111
|
2019-04-26 07:34:04 -07:00 |
|
Dessalines
|
009b3b5079
|
Spamtimer
|
2019-04-25 22:50:42 -07:00 |
|
Dessalines
|
cd03fa5e03
|
Temp
|
2019-04-25 20:14:52 -07:00 |
|
Dessalines
|
f8b8344815
|
Added sponsor
|
2019-04-25 18:42:21 -07:00 |
|
Dessalines
|
244c1dff0c
|
Switching back to going directly to link if it has a url.
|
2019-04-25 15:00:05 -07:00 |
|
Dessalines
|
4b76cccce4
|
Adding /f/ and /u/ in links now.
- Fixes #102
|
2019-04-25 14:52:18 -07:00 |
|
Dessalines
|
ca26756d0a
|
After signup, redirect to communities page.
|
2019-04-25 11:26:44 -07:00 |
|
Dessalines
|
b3fad913a7
|
Version bump.
|
2019-04-25 09:02:39 -07:00 |
|
Dessalines
|
5c8e23bb4c
|
Fixes for login screen, server
|
2019-04-25 08:51:23 -07:00 |
|
Dessalines
|
3b181d027c
|
Version bump
|
2019-04-24 21:06:43 -07:00 |
|
Dessalines
|
5f0799d5cc
|
Removed some redundant code.
|
2019-04-24 20:57:07 -07:00 |
|
Dessalines
|
466e496593
|
vote styling issue
|
2019-04-24 18:03:21 -07:00 |
|
Dessalines
|
d7ae04dd16
|
Image thumbnail click now expands here.
|
2019-04-24 10:42:57 -07:00 |
|
Dessalines
|
fbdb2e410a
|
Adding image thumbnails.
|
2019-04-24 10:26:15 -07:00 |
|
Dessalines
|
d31513d7b9
|
A New comment highlighter
|
2019-04-24 09:58:45 -07:00 |
|
Dessalines
|
55b684c6f1
|
Adding a simple image expander instead of iframes.
- Fixes #91
|
2019-04-24 09:28:20 -07:00 |
|
Dessalines
|
e71637bc92
|
Better vote arrows
|
2019-04-24 08:26:49 -07:00 |
|
Dessalines
|
f670ed3f29
|
Adding a sponsors page.
|
2019-04-23 20:17:02 -07:00 |
|
Dessalines
|
83f9bda4a1
|
Version bump
|
2019-04-23 15:08:01 -07:00 |
|
Dessalines
|
73b9266580
|
Adding a search page
- Fixes # 70
|
2019-04-23 15:05:50 -07:00 |
|
Dessalines
|
5bcb509a82
|
Comment actions from inbox and user pages working.
- Fixes #93
|
2019-04-22 11:32:50 -07:00 |
|
Dessalines
|
0ceb168044
|
Removing expires temporarily until they can be figured out.
|
2019-04-22 10:45:50 -07:00 |
|
Dessalines
|
51d6aaaf25
|
Adding document titles.
- Fixes #100
|
2019-04-22 09:24:13 -07:00 |
|
Dessalines
|
ce35c3f16e
|
Style fix
|
2019-04-21 17:38:35 -07:00 |
|
Dessalines
|
1632d6f23f
|
Some chat styling
|
2019-04-21 17:27:39 -07:00 |
|
Dessalines
|
b7cbea66d3
|
Making chat / new comments section sticky top and fitting to your
viewport
- Fixes #97. #98
|
2019-04-21 16:44:47 -07:00 |
|
Dessalines
|
90565a4993
|
Add site editing.
- Fixes #96
|
2019-04-21 14:38:57 -07:00 |
|
Dessalines
|
92781044a5
|
Community moderation fixes.
- Don't show banned communities on main post list. Fixes #95
- Add back in community moderation and editing. Fixes #92
|
2019-04-21 13:52:55 -07:00 |
|
Dessalines
|
2e4a4c90ac
|
Adding a recurring inbox fetch.
- Fixes #94
|
2019-04-21 10:49:57 -07:00 |
|
Dessalines
|
535231f800
|
Fixing ranking algorithm.
|
2019-04-21 10:15:40 -07:00 |
|
Dessalines
|
93a512b7a1
|
Adding negative score fix
- Fixes #84.
- Fixing unit tests.
|
2019-04-20 16:47:23 -07:00 |
|
Dessalines
|
f8aa7cf0c0
|
Fixing envelope icon.
- Fixes #90
|
2019-04-20 15:49:23 -07:00 |
|
Dessalines
|
760324c845
|
Adding version to footer
|
2019-04-20 13:23:42 -07:00 |
|
Dessalines
|
ebca600f31
|
Fixing issue with front page.
|
2019-04-20 13:20:27 -07:00 |
|
Dessalines
|
fe52d594f6
|
Adding support for an /all route
- Fixes #85
|
2019-04-20 12:42:52 -07:00 |
|
Dessalines
|
ff013ccfc2
|
Links from posts open in new tab.
- Fixes #88
|
2019-04-20 12:04:17 -07:00 |
|
Dessalines
|
cb307cf30a
|
Version bump.
|
2019-04-20 11:34:52 -07:00 |
|
Dessalines
|
72798d1cc1
|
Mostly working, before merge
|
2019-04-20 11:17:00 -07:00 |
|
Dessalines
|
103a92d6b6
|
More moderation fixed
|
2019-04-20 00:24:59 -07:00 |
|
Dessalines
|
b25b1b6a0d
|
Saving replies, the actual fixes will be in the merge to dev.
|
2019-04-19 21:06:25 -07:00 |
|
Dessalines
|
25b75de078
|
Remove reliance on google fonts.
Fixes #78
|
2019-04-19 08:59:21 -07:00 |
|
Dessalines
|
235f305019
|
Fix blockquote css
Fixes #80
|
2019-04-18 09:06:19 -07:00 |
|
Dessalines
|
ebe9627dba
|
Fixing some community sorting.
|
2019-04-18 08:28:24 -07:00 |
|
Dessalines
|
0e582c9d3c
|
Version bump
|
2019-04-18 08:15:39 -07:00 |
|
Dessalines
|
a8f421486c
|
Adding max length to user, post, and forum fields.
Fixes #76
|
2019-04-18 08:14:45 -07:00 |
|
Dessalines
|
e73d28f5f2
|
Forum category changing on edit issue.
- Fixes #69
|
2019-04-17 21:07:47 -07:00 |
|
Dessalines
|
aa060f245a
|
Version bump
|
2019-04-17 16:58:36 -07:00 |
|
Dessalines
|
6577f3bf8d
|
Fixing a bug with community pages
|
2019-04-17 16:31:08 -07:00 |
|
Dessalines
|
e1289050fa
|
Fixing a bug with listing type
|
2019-04-17 12:58:14 -07:00 |
|
Dessalines
|
f9bf4ad7e3
|
Adding modlog paging.
|
2019-04-17 12:40:41 -07:00 |
|
Dessalines
|
e405a7f76d
|
Version bump.
|
2019-04-17 11:33:53 -07:00 |
|
Dessalines
|
335cabc1aa
|
Adding post and user details paging.
- Fixes #52
- Fixes #34
|
2019-04-17 11:30:13 -07:00 |
|
Dessalines
|
65650c8ba7
|
Adding better comment highlighting.
Fixes #66
|
2019-04-16 20:23:52 -07:00 |
|
Dessalines
|
e7055b80df
|
Version update
|
2019-04-16 17:32:13 -07:00 |
|
Dessalines
|
2e73146e50
|
Before big moderation merge
|
2019-04-16 16:04:23 -07:00 |
|
Dessalines
|
5351e379d5
|
Commiting before I lose everything. I'll do this properly in a merge
|
2019-04-15 16:12:06 -07:00 |
|
Dessalines
|
5cd5c7ccf1
|
Adding docker caching
|
2019-04-10 11:10:57 -07:00 |
|
Dessalines
|
8e5a5d17a8
|
Adding trending communities.
- Fixes #29
- Communities fetching now has sort and limit.
|
2019-04-09 23:19:12 -07:00 |
|
Dessalines
|
658795f531
|
Navbar fix
|
2019-04-09 15:33:49 -07:00 |
|
Dessalines
|
ab9cdd990d
|
Styling, sidebar message.
|
2019-04-09 14:21:19 -07:00 |
|
Dessalines
|
463cacdf72
|
Adding slur filter.
- Fixes #45
|
2019-04-09 11:35:16 -07:00 |
|
Dessalines
|
85d16e8632
|
Fixing endpoint.
|
2019-04-09 08:03:58 -07:00 |
|
Dessalines
|
a705e81c0c
|
Fixing endpoint.
|
2019-04-09 07:46:44 -07:00 |
|
Dessalines
|
e24641dccb
|
Temp removing fusebox git describe since it breaks docker.
|
2019-04-08 23:47:08 -07:00 |
|