sam/pleroma-fe
sam/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6999 commits 3 branches 15 tags 109 MiB
Commit graph

6999 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Therapy
b343a88d77
Use akkoma maybe
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-11-30 17:01:38 +01:00
Sam Therapy
93585ed1a4
Merge branch 'develop' of https://akkoma.dev/AkkomaGang/pleroma-fe into froth-akkoma 2022-11-30 15:22:52 +01:00
floatingghost
0900a9d87b Merge pull request 'Add post expiry inputs' (#239) from default-post-expiry into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/239
 2022-11-28 13:35:08 +00:00
FloatingGhost
0a01a2bdf0 Add post expiry inputs 2022-11-28 12:08:18 +00:00
Puniko
59a3e3fcbb Merge branch 'develop' into fedi-absturztau-be 2022-11-27 09:57:22 +01:00
darkkirb
7860c885c4 Add link to RSS feed to the profile (#234) 
Today I learned that akkoma and mastodon (and potentially other activitypub services) offer RSS/Atom feeds for user profiles at `[user profile url].rss`. This PR adds a direct link to the feed because I haven’t seen anything link to the feed on either mastodon-fe or pleroma-fe

Co-authored-by: Charlotte 🦝 Delenk <lotte@chir.rs>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/234
Co-authored-by: darkkirb <lotte@chir.rs>
Co-committed-by: darkkirb <lotte@chir.rs>
 2022-11-26 20:57:04 +00:00
floatingghost
1c3bd60af2 Merge pull request 'fix formatting for large number of favorites/interactions' (#236) from drudge/pleroma-fe:develop into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/236
 2022-11-26 18:32:35 +00:00
Sean Meininger
b8faee5d6d added maintainer code 2022-11-26 00:15:12 -08:00
floatingghost
c01c62f149 Redirect users to "awaiting approval" message on register (#231) 
Ref #81 - this implements a "your request has been sent" message

 ![image](/attachments/61dc3f5e-2706-46f9-a1ca-4efe3f526ff3)

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/231
 2022-11-22 14:44:44 +00:00
floatingghost
105b934f90 Only reload user if it _is_ a user (#232) 
Ref #181

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/232
 2022-11-22 14:40:25 +00:00
FloatingGhost
b1f41add0e Don't error out if we can't fetch reports 2022-11-21 17:08:53 +00:00
floatingghost
e4e8ed812b Merge pull request 'Allow using mouse wheel to navigate through the emoji tabs (#179)' (#222) from Mergan/pleroma-fe:emoji-picker-allow-scroll into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/222
 2022-11-21 16:51:30 +00:00
Beefox
684894aee3 mobile-newline (#226) 
Allows the handle of users to drop down onto the next line if there isn't enough room in order to improve useability on mobile

Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/226
Co-authored-by: Beefox <bee@beefox.xyz>
Co-committed-by: Beefox <bee@beefox.xyz>
 2022-11-21 16:49:18 +00:00
floatingghost
f8a796b234 Merge pull request 'move domain block to drop down menu (#223)' (#224) from nocebo/crt-fe:shared/move-domain-mute into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/224
 2022-11-21 16:46:29 +00:00
floatingghost
70ea9e772c Merge pull request 'Allow for searching unicode emoji via inputting emoji (#163 & #227)' (#230) from Mergan/pleroma-fe:beefox-emoji-search into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/230
 2022-11-21 10:11:19 +00:00
Mergan
efe0f53736 Constrain content to status content (#218) (#220) 
MFM No longer overflows
![image](/attachments/7bbf519a-9fd2-492d-aba0-9a0e1ded6373)

Co-authored-by: David <dmgf2008@hotmail.com>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/220
Co-authored-by: Mergan <mergan@noreply.akkoma>
Co-committed-by: Mergan <mergan@noreply.akkoma>
 2022-11-21 10:10:50 +00:00
Beefox
fcbbbad8d4 Allow for searching unicode emoji via inputting emoji 
(This is needed for the react menu)
 2022-11-21 01:04:00 -08:00
FloatingGhost
39b6b0b49f Merge remote-tracking branch 'origin/translations' into develop 2022-11-20 22:26:32 +00:00
FloatingGhost
867a86d887 Fix build 2022-11-20 22:26:16 +00:00
FloatingGhost
7538369fa1 Copy conversation display style from instance 
Fixes #210
 2022-11-20 22:18:34 +00:00
Puniko
b6280ae97d resolve merge conflicts 2022-11-20 08:37:26 +01:00
Weblate
2d4b2f2e20 Translated using Weblate (Spanish) 
Currently translated at 87.1% (893 of 1025 strings)

Co-authored-by: taretka <info@tarteka.net>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/es/
Translation: Pleroma fe/pleroma-fe
 2022-11-19 21:22:45 +00:00
astra
862c93706c move domain block to drop down menu 2022-11-18 08:49:57 -05:00
David
e06348ee33 Allow using mouse wheel to navigate through the emoji tabs 2022-11-17 14:45:32 -08:00
FloatingGhost
169282ea42 rely on backend mfm parsing 2022-11-15 15:54:16 +00:00
floatingghost
db46879a8f Big 'ol set of patches and dep maintenance (#212) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/212
 2022-11-15 15:47:32 +00:00
FloatingGhost
0770981a20 Ensure we don't fail if translation is disabled 2022-11-12 19:06:39 +00:00
floatingghost
c2a5a8c91f Merge pull request 'Use correct pluralization in reports tab' (#206) from sfr/pleroma-fe:fix/reports-plural into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/206
 2022-11-12 16:38:26 +00:00
Sol Fisher Romanoff
a1c0642bb5
Use correct pluralization in reports tab 2022-11-12 18:35:25 +02:00
Weblate
1157396ed5 Translated using Weblate (Japanese (ja_PEDANTIC)) 
Currently translated at 99.5% (1020 of 1025 strings)

Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja_PEDANTIC/
Translation: Pleroma fe/pleroma-fe
 2022-11-12 15:33:13 +00:00
Weblate
5a76dd5f90 Translated using Weblate (Spanish) 
Currently translated at 85.7% (874 of 1019 strings)

Translated using Weblate (Spanish)

Currently translated at 85.7% (874 of 1019 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: mint <they@mint.lgbt>
Co-authored-by: taretka <info@tarteka.net>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/es/
Translation: Pleroma fe/pleroma-fe
 2022-11-12 15:33:13 +00:00
FloatingGhost
c7200b2234 make emoji reactions in notifications bar wider 2022-11-11 16:47:25 +00:00
FloatingGhost
98074ed90d make desc overflow a scroll 2022-11-11 16:20:41 +00:00
floatingghost
d51308a56b Merge pull request 'Set max-height for description container' (#201) from xarvos/pleroma-fe:fix-overflowing-description into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/201
 2022-11-11 16:19:59 +00:00
FloatingGhost
4b5536ae68 Merge branch 'develop' of akkoma.dev:AkkomaGang/pleroma-fe into develop 2022-11-11 16:05:10 +00:00
FloatingGhost
e44462b1d5 add "no reports" message 2022-11-11 16:05:02 +00:00
Ngô Ngọc Đức Huy
af32f901ac
Set max-height for description container 
Without max-height, the description text can overflow the image, making
it impossible to close.

See issue #199: https://akkoma.dev/AkkomaGang/pleroma-fe/issues/199
 2022-11-11 11:33:21 +07:00
floatingghost
0810c57c8b Merge pull request 'Hide bubble timeline icon from desktop nav if empty' (#197) from sfr/pleroma-fe:fix/navbar-hide-bubble into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/197
 2022-11-10 12:10:05 +00:00
FloatingGhost
e77931d68c Use correct sensitiveIfSubject key 2022-11-10 12:06:59 +00:00
floatingghost
f3962e3be7 Merge pull request 'Add "requested to follow you" text on card' (#200) from inbound-requesting into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/200
 2022-11-10 03:16:17 +00:00
FloatingGhost
1e8fc5bcc4 Add "requested to follow you" text on card 2022-11-10 03:01:20 +00:00
Sol Fisher Romanoff
642fe3dc10
Hide bubble timeline icon from desktop nav if empty 2022-11-08 18:50:42 +02:00
FloatingGhost
8713f1870f use correct key for languages 
fixes #196
 2022-11-08 12:25:47 +00:00
floatingghost
837c61569a Merge pull request 'Fix profile field deletion' (#195) from sn0w/pleroma-fe:fix-profile-field-deletion into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/195
 2022-11-07 14:00:43 +00:00
sn0w
a83c3a1fa1
Fix profile field deletion 2022-11-07 14:53:13 +01:00
Weblate
4d8f288bd9 Merge branch 'origin/develop' into Weblate. 2022-11-06 22:52:26 +00:00
floatingghost
3286641f3c Add software info on hover (#194) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/194
 2022-11-06 22:52:25 +00:00
Weblate
677f5ae071 Merge branch 'origin/develop' into Weblate. 2022-11-06 21:26:06 +00:00
sfr
15bac1e401 Add reports management (#186) 
implements part of #178, other parts will come later

Co-authored-by: Sol Fisher Romanoff <sol@solfisher.com>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/186
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
 2022-11-06 21:26:05 +00:00
Weblate
22b4aed8f6 Merge branch 'origin/develop' into Weblate. 2022-11-06 20:59:46 +00:00