Commit graph

228 commits

Author SHA1 Message Date
b68e968bf9 Add ability to include custom CSS 2022-12-06 15:26:16 +00:00
a3e490edcd use cutout of 512 logo 2022-12-02 12:00:30 +00:00
6af1df8bef Add logo files 2022-12-02 11:27:24 +00:00
db46879a8f Big 'ol set of patches and dep maintenance (#212)
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: AkkomaGang/pleroma-fe#212
2022-11-15 15:47:32 +00:00
sfr
974663c42d Fix broken MFM tags (#93)
Reviewed-on: AkkomaGang/pleroma-fe#93
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-08-01 11:10:54 +00:00
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: AkkomaGang/pleroma-fe#29
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-07-15 09:57:17 +00:00
d29bccb7d6 bugfix: spin css, props setting 2022-07-15 10:55:47 +01:00
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
52644ec5cb remove IHBA ToS 2022-06-16 11:35:25 +01:00
36309ebe04 don't clip on overflow 2022-06-14 17:28:41 +01:00
ef1c3d57b6 fix styling 2022-06-14 16:35:08 +01:00
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
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
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
Henry Jameson
c197756767 Basic no-wallpaper support 2020-12-16 18:25:07 +02: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
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
Henry Jameson
1b50d700aa bye bye fontello 2020-10-21 00:34:42 +03:00
Shpuld Shpuldson
20d33c2fbc change icon to a megaphone 2020-09-16 11:53:54 +03:00
sadposter
6f621dd34c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-07-10 11:27:53 +01:00
sadposter
954d5c05df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-07-09 22:32:18 +01:00
eugenijm
aa2cf51c05 Add Chats 2020-07-08 15:21:31 +03:00
Dym Sohin
1767ee01d0 corrected tos.html location 2020-07-07 19:34:45 +00:00
Shpuld Shpuldson
87b5f828d7 fix conflicts, use file icon instead of link, add support for audio and file icon in cw'd posts 2020-07-06 14:01:03 +03:00
Eugenij
de291e2e33 Add bookmarks
Co-authored-by: jared <jaredrmain@gmail.com>
2020-07-03 19:45:49 +00:00
Shpuld Shpuldson
96d2c86d3b change placeholders to use descriptions, use icons with placeholders, change uploads to use attachment component 2020-06-29 14:48:22 +03:00
sadposter
77bd79100b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-06-19 11:01:06 +01:00
Henry Jameson
e4b18deece fix redmond themes 2020-06-13 13:16:53 +03:00
lain
fd109fa355 Merge branch 'develop' into 'chore/improve-default-tos'
# Conflicts:
#   static/terms-of-service.html
2020-06-12 14:17:56 +00:00
Henry Jameson
a6ca923a76 icons update 2020-05-25 16:10:43 +03:00
sadposter
78db835fe1 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-05-20 17:16:21 +01:00
Shpuld Shpludson
a8e9c05f09 Merge branch 'feat/sidebar-alignment' into 'develop'
[#765] Permit sidebar alignment with instance configuration option

See merge request pleroma/pleroma-fe!1106
2020-05-20 15:42:42 +00:00
Mark Felder
2135dc8510 Merge branch 'develop' into feat/sidebar-alignment 2020-05-15 12:26:38 -05:00
Mark Felder
840c6f40b6 Merge branch 'develop' into chore/remote-unused-option 2020-05-14 12:22:28 -05:00
Mark Felder
0ef5965b3b Add missing settings: disableChat, greentext, hideFilteredStatuses, hideMutedPosts, hidePostStats, hideSitename 2020-05-13 14:52:48 -05:00
Mark Felder
1db2fc3f41 alpha sort 2020-05-13 14:52:21 -05:00
Mark Felder
c2bba3f5ad Remove unused noAttachmentLinks option 2020-05-13 14:28:35 -05:00
Mark Felder
bc5005b3dd Permit sidebar alignment with instance configuration option 2020-05-12 13:59:52 -05:00