sam/pleroma-fe
sam
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,151 Commits 3 Branches 15 Tags 109 MiB
Commit Graph

252 Commits

Author SHA1 Message Date
Sam Therapy 168da6e7ed
froth-specific changes to panel and terms
continuous-integration/drone/push Build is passing Details 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2023-01-20 18:30:51 +01:00
Sam Therapy 38aed60c43
add a config option by default
continuous-integration/drone/push Build is passing Details 
the blurhash is UGLY

Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2023-01-04 17:17:01 +01:00
Sam Therapy bd0bfffee3
froth: add PWA logo
continuous-integration/drone/push Build is passing Details 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2023-01-04 15:52:26 +01:00
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
continuous-integration/drone/push Build was killed Details
2023-01-04 15:47:02 +01:00
FloatingGhost f288d0c219 Make everything work with a strict CSP 2023-01-02 15:16:42 +00:00
FloatingGhost 313ddcebcb Add blurhash support 2022-12-30 04:57:23 +00:00
FloatingGhost ea941d7cfa remove IHBA assets 2022-12-30 03:20:12 +00:00
Sam Therapy bc35e1c8f9
Merge branch 'develop' of https://akkoma.dev/AkkomaGang/pleroma-fe into froth-akkoma
continuous-integration/drone/push Build is passing Details
2022-12-09 15:21:08 +01:00
FloatingGhost b68e968bf9 Add ability to include custom CSS 2022-12-06 15:26:16 +00:00
FloatingGhost a3e490edcd use cutout of 512 logo 2022-12-02 12:00:30 +00:00
FloatingGhost 6af1df8bef Add logo files 2022-12-02 11:27:24 +00:00
Sam Therapy 89fa961b6d
Add unicode emojis the old way :)
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 de51942ac7
deploy to a new location maybe
continuous-integration/drone/push Build is passing Details 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-11-30 18:55:46 +01:00
Sam Therapy b343a88d77
Use akkoma maybe
continuous-integration/drone/push Build is passing Details 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-11-30 17:01:38 +01: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
Absturztaube 504a11c9da Merge branch 'develop' into fedi-absturztau-be 2022-08-07 11:46:50 +02:00
sfr 974663c42d Fix broken MFM tags (#93) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/93
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
 2022-08-01 11:10:54 +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 dba047ce34 Merge branch 'develop' into marked-mfm 2022-07-15 10:58:41 +01:00
sfr 931ed3d3c7 Use Marked and marked-mfm for MFM rendering (#29) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/29
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
 2022-07-15 09:57:17 +00:00
FloatingGhost d29bccb7d6 bugfix: spin css, props setting 2022-07-15 10:55:47 +01:00
norm 4d84fd4cf7 Fix path to terms-of-service.html 2022-07-12 20:46:08 +00:00
Sol Fisher Romanoff 8c9821e444
Parse MFM options with values 2022-07-12 20:36:48 +03:00
Sol Fisher Romanoff 5f9e3709b3
Update MFM css 2022-07-09 14:34:31 +03:00
FloatingGhost 52644ec5cb remove IHBA ToS 2022-06-16 11:35:25 +01:00
FloatingGhost 36309ebe04 don't clip on overflow 2022-06-14 17:28:41 +01:00
FloatingGhost ef1c3d57b6 fix styling 2022-06-14 16:35:08 +01:00
FloatingGhost ed42c476fb allow MFM authoring 2022-06-14 15:57:02 +01:00
sadposter feb7090cde Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2021-08-05 12:59:18 +01:00
sadposter 214d85189c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2021-06-25 10:07:29 +01:00
Absturztaube fcf1c7b4b4 resolve merge conflicts 2021-06-21 13:58:30 +02:00
Mark Felder 21477d07e9 This setting didn't actually do anything 2021-06-01 16:51:47 -05:00
Mark Felder 0604b1d5b7 Rename legacy PleromaFE Chat functionality to "Shout" 2021-06-01 12:51:20 -05:00
sadposter 28ac9d83c1 Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma-fe into develop 2021-05-21 11:42:10 +01:00
FloatingGhost 6d47156297 Merge branch 'develop' of https://git.ihatebeinga.live/IHBAGang/pleroma-fe into develop 2021-05-21 11:37:33 +01:00
sadposter edb5826072 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-12-29 13:25:38 +00:00
Absturztaube 381c4e7f82 resolve merge conflicts 2020-12-29 13:00:48 +01:00
Henry Jameson c197756767 Basic no-wallpaper support 2020-12-16 18:25:07 +02:00
Absturztaube ad728d9046 resolve conflichts 2020-12-04 20:45:10 +01:00
Shpuld Shpuldson 767db567ad update emoji.json, add script that merges new emoji from another source 2020-11-30 14:43:39 +02:00
sadposter 7e1b1ec990 :Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-11-15 19:45:52 +00:00
sadposter 804e25084d thing 2020-11-15 19:45:14 +00:00
Absturztaube 8065afc4d7 resolve merge conflicts 2020-11-08 14:04:17 +01:00
Henry Jameson 3db218dec1 change logo to svg 2020-11-02 19:37:01 +02:00
sadposter e21dd584a9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-11-01 12:26:14 +00:00
Henry Jameson 633349ddff Refactor desktop navbar into a component, change layout to grid for 
better compatibility with search field and simpler CSS
 2020-10-29 22:54:28 +02:00
Absturztaube a43623c5a5 Merge branch 'develop' into fedi-absturztau-be 2020-10-29 09:24:25 +01:00
Henry Jameson 1b50d700aa bye bye fontello 2020-10-21 00:34:42 +03:00