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

300 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
Details
2023-01-04 15:47:02 +01:00
FloatingGhost 313ddcebcb Add blurhash support 2022-12-30 04:57:23 +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
Details
2022-12-09 15:21:08 +01:00
FloatingGhost 17e574b173 Move theme apply/reset to new row 
Fixes #225
 2022-12-06 15:55:39 +00:00
Sam Therapy 89fa961b6d
Add unicode emojis the old way :)
All checks were successful
continuous-integration/drone/push Build is passing
Details 
also lint

Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-12-01 20:37:19 +01:00
Sam Therapy 27b350ecce
Revert "purge shout/chat (#49)" 
This reverts commit a8c4aec721.
 2022-11-30 17:20:17 +01:00
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 0a01a2bdf0 Add post expiry inputs 2022-11-28 12:08:18 +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
FloatingGhost 0770981a20 Ensure we don't fail if translation is disabled 2022-11-12 19:06:39 +00:00
FloatingGhost 8713f1870f use correct key for languages 
fixes #196
 2022-11-08 12:25:47 +00:00
sn0w a83c3a1fa1
Fix profile field deletion 2022-11-07 14:53:13 +01:00
FloatingGhost 469063ff52 Debounce word filters 
Fixes #182
 2022-11-02 22:08:58 +00:00
Puniko 1b190db9ed Merge branch 'develop' into fedi-absturztau-be 2022-10-19 17:48:12 +02: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
Puniko 31fa6223ec resolve merge conflicts 2022-09-17 11:17:40 +02: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
FloatingGhost 7dc0464094 split translation language by source and dest 2022-08-30 17:46:54 +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
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 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
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
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 a2541bb4e0 Add quotes (#59) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/59
 2022-07-25 16:25:41 +00: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
floatingghost fab72940c4 announcements (#42) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/42
 2022-07-18 13:08:50 +00:00
floatingghost 2977edc04d theme tab: don't crash out on non-colours (#41) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/41
 2022-07-17 13:13:51 +00:00
sfr 677e5325fa implement Move activities (#26) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/26
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
 2022-07-04 16:38:58 +00:00
sfr 716320de35 Respect subject lines in notifications (#23) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/23
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
 2022-06-27 16:15:24 +00:00
floatingghost 3806f579b9 Merge pull request 'Correctly link to BE commit in version tab' (#3) from sfr/pleroma-fe:develop into develop 
Reviewed-on: http://akkoma.dev/AkkomaGang/pleroma-fe/pulls/3
 2022-06-17 11:56:12 +00:00
FloatingGhost 1ad17fc2bf run stylelint 2022-06-15 16:58:02 +01:00
Sol Fisher Romanoff adc6b86e6b
Correctly link to BE commit in version tab 2022-06-14 22:13:51 +03:00
FloatingGhost 9f764a4217 Merge branch 'mfm' into develop 2022-06-14 16:35:18 +01:00
FloatingGhost ed42c476fb allow MFM authoring 2022-06-14 15:57:02 +01:00
Sol Fisher Romanoff dbf045c842
Link to akkoma repos in version tab 2022-06-14 13:52:11 +03:00
FloatingGhost d2bce51941 resolve merge conflicts 2022-06-11 10:58:50 +02:00
Absturztaube 89a37d84b2 resolve merge conflicts 2022-06-11 10:55:23 +02:00
FloatingGhost f6cf509a04 Merge remote-tracking branch 'upstream/develop' into develop 2022-06-08 18:09:16 +01:00
FloatingGhost a731f046b3 fix emoji sizing 2022-06-08 17:22:45 +01:00
HJ 0aa334515b Merge branch 'threecolumn' into 'develop' 
Layout refactoring + Three column mode

See merge request pleroma/pleroma-fe!1503
 2022-05-31 17:46:59 +00:00
HJ 9725443e60 Revert "Merge branch 'revert-a88abc7e' into 'develop'" 
This reverts merge request !1526
 2022-05-22 16:40:59 +00:00
HJ 069cf3fa87 Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'" 
This reverts merge request !1494
 2022-05-22 16:38:09 +00:00