Commit graph

842 commits

Author SHA1 Message Date
Sam Therapy 3a0825cf25
Merge branch 'froth-akkoma' of git.froth.zone:Sam/pleroma-fe; branch 'develop' of https://akkoma.dev/AkkomaGang/pleroma-fe into froth-akkoma
Some checks reported errors
continuous-integration/drone/push Build was killed
2023-01-04 15:47:02 +01:00
FloatingGhost d973396c96 Remove console.log 2023-01-01 21:06:02 +00:00
FloatingGhost 62287fffae add follow/unfollow to followed tags list 2023-01-01 21:05:25 +00:00
FloatingGhost e9f16af82d Add list of followed hashtags to profile 2023-01-01 20:11:07 +00:00
FloatingGhost 313ddcebcb Add blurhash support 2022-12-30 04:57:23 +00:00
Norm 014f8b0dd2 Make minimum width for 3-column layout 1280px (#255) (#256)
1280px is a pretty common screen width for several resolutions
(1280x720, 1280x800, 1280x1024, etc.). Since it is only 20px less than
the current 1300px minimum, this shouldn't be a big issue to lower the
minimum screen width for the 3-column layout to 1280px.

Closes: https://akkoma.dev/AkkomaGang/pleroma-fe/issues/255

Co-authored-by: Francis Dinh <normandy@biribiri.dev>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma-fe/pulls/256
Co-authored-by: Norm <normandy@biribiri.dev>
Co-committed-by: Norm <normandy@biribiri.dev>
2022-12-30 03:01:17 +00:00
Sam Therapy 96037187c9
Merge branch 'develop' of https://akkoma.dev/AkkomaGang/pleroma-fe into froth-akkoma 2022-12-28 22:13:07 +01:00
FloatingGhost c39332c1bf Revert "Revert "use v1 urls""
This reverts commit 8c6cf86de3.
2022-12-14 09:39:01 +00:00
FloatingGhost 8c6cf86de3 Revert "use v1 urls"
This reverts commit 909271c764.
2022-12-14 09:38:46 +00:00
FloatingGhost 909271c764 use v1 urls 2022-12-14 09:38:07 +00:00
Sam Therapy bc35e1c8f9
Merge branch 'develop' of https://akkoma.dev/AkkomaGang/pleroma-fe into froth-akkoma
All checks were successful
continuous-integration/drone/push Build is passing
2022-12-09 15:21:08 +01:00
floatingghost eb49295422 Add hashtag following button (#244)
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/244
2022-12-04 17:31:41 +00:00
Sam Therapy 27b350ecce
Revert "purge shout/chat (#49)"
This reverts commit a8c4aec721.
2022-11-30 17:20:17 +01:00
Puniko 59a3e3fcbb Merge branch 'develop' into fedi-absturztau-be 2022-11-27 09:57:22 +01: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
Puniko b6280ae97d resolve merge conflicts 2022-11-20 08:37:26 +01: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
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
FloatingGhost d8643b5b4a Take instance stopGifs value 2022-10-29 22:08:25 +01:00
Puniko 1b190db9ed Merge branch 'develop' into fedi-absturztau-be 2022-10-19 17:48:12 +02:00
FloatingGhost 7df49720de ensure we sync settings whilst tab is open 2022-10-08 11:55:48 +01:00
Sean King 2453a338be Added support for removing users from followers 2022-10-06 17:06:53 +01:00
floatingghost 4f837f75ea setting-sync (#175)
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/175
2022-10-06 15:59:16 +00:00
FloatingGhost 87683052e8 add hacky reply filtering, turn off streaming by default 2022-09-20 16:27:17 +01:00
Norm aedd0794a4 Remote interaction with posts (#168)
From: https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1419

This is the frontend side of https://akkoma.dev/AkkomaGang/akkoma/pulls/198 (merged in a6d85003fe).

Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/168
Co-authored-by: Norm <normandy@biribiri.dev>
Co-committed-by: Norm <normandy@biribiri.dev>
2022-09-19 17:39:21 +00:00
Puniko 31fa6223ec resolve merge conflicts 2022-09-17 11:17:40 +02:00
floatingghost 2da92fcd13 editing (#158)
Co-authored-by: Sean King <seanking2919@protonmail.com>
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/158
2022-09-06 19:25:03 +00:00
floatingghost 6084cbbb00 collapse statuses with CWs by default (#157)
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/157
2022-09-06 17:00:15 +00:00
floatingghost ae1b6ad887 Customisation of default profile tab, clean up settings (#156)
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/156
2022-09-05 17:02:16 +00:00
Mergan 48826ede36 Separated Posts & Replies (#145) (#148)
Co-authored-by: David <dmgf2008@hotmail.com>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/148
Co-authored-by: Mergan <mergan@noreply.akkoma>
Co-committed-by: Mergan <mergan@noreply.akkoma>
2022-08-31 15:28:09 +00:00
FloatingGhost 7dc0464094 split translation language by source and dest 2022-08-30 17:46:54 +01:00
FloatingGhost 6440e51b7e allow translating to any other language 2022-08-30 15:43:57 +01:00
FloatingGhost ef50c63dc7 use supported languages from service 2022-08-30 14:37:36 +01:00
FloatingGhost e7c21ffbd7 allow selecting languages for translation 2022-08-29 22:16:59 +01:00
FloatingGhost 48a11cb9d1 add translation options 2022-08-29 20:02:34 +01:00
Absturztaube dccf5ed1c0 resolve merge conflicts 2022-08-28 10:34:00 +02:00
floatingghost 776bee889e Confirmation dialogs (#140)
supercedes #135

adapted from https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1431

Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/140
2022-08-26 11:58:33 +00:00
floatingghost 2d85ee6a08 use-server-side-mfm (#133)
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/133
2022-08-18 03:14:38 +00:00
floatingghost e61228b031 use akkoma-specific source for MFM unless asked not to (#132)
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/132
2022-08-17 09:34:50 +00:00
floatingghost 64fdde52f6 timeline panel nav (#131)
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/131
2022-08-17 08:41:36 +00:00
eris ca0b730605 Redo desktop nav, add options for site name and favicon (#83)
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/83
Co-authored-by: eris <femmediscord@gmail.com>
Co-committed-by: eris <femmediscord@gmail.com>
2022-08-14 23:24:59 +00:00
FloatingGhost 9ede66fcc0 enable misskey markdown by default
fixes #67
2022-08-11 10:21:00 +01:00
eris d4f8934e8a New option: Pause MFM animations until status hover (#120)
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/120
Co-authored-by: eris <femmediscord@gmail.com>
Co-committed-by: eris <femmediscord@gmail.com>
2022-08-08 15:47:06 +00:00
Absturztaube 504a11c9da Merge branch 'develop' into fedi-absturztau-be 2022-08-07 11:46:50 +02:00
Yukkuri f474763151 Commit list accounts state after difference in removed accounts is determined (#82)
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/82
Co-authored-by: Yukkuri <iamtakingiteasy@eientei.org>
Co-committed-by: Yukkuri <iamtakingiteasy@eientei.org>
2022-08-01 10:11:39 +00:00
sfr 7c675f1ded Add toggle to hide posts mentioning blocked users (#78)
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/78
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-07-31 21:47:25 +00:00
Absturztaube d3d13d50d4 resolve merge conflicts 2022-07-26 12:22:07 +02:00
Absturztaube 6b10df2d89 merged akkoma-fe develop 2022-07-26 10:44:11 +02:00
FloatingGhost 18fc3a0ad5 add bubble timeline 2022-07-22 15:36:45 +01:00
floatingghost a8c4aec721 purge shout/chat (#49)
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/49
2022-07-20 15:36:45 +00:00