14eaeb3f26
Merge remote-tracking branch 'puni/fedi-absturztau-be' into froth
2022-02-20 11:52:46 -06:00
450ee4d6d4
Undo puni's changes temporarily
2022-02-20 11:12:33 -06:00
0f1d5ec382
spaces
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-02-19 16:17:44 -06:00
f94f9eca89
Make emoji list more complete
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-02-19 15:37:02 -06:00
a6c66f3bbf
bed I guess
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-02-19 14:18:17 -06:00
86fee257a2
Change panel & terms of service
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-12-03 13:51:17 -06:00
0f2a8c69a9
Make media modal be aware of multi-touch actions
...
Originally the media viewer would think every touch is a swipe (one-finger
touch event), so we would encounter the case where a two-finger scale event
would incorrectly change the current media. This is now fixed.
2021-10-29 00:43:35 +00:00
0ab3e10858
fix TOS
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-10-02 00:07:51 -05:00
bf5ce3f6f4
add a real TOS
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-10-01 15:01:51 -05:00
594410cd82
Add new theme
2021-08-12 19:03:33 -05:00
4e7482ae49
Fix mod loader, TOS and external link
2021-08-12 14:08:09 -05:00
8d9d0d5e2c
Add changes
2021-08-12 12:22:34 -05: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
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
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
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
Absturztaube
7a9bd70a09
Merge branch 'develop' into fedi-absturztau-be
2020-10-07 18:51:14 +02:00
Shpuld Shpuldson
20d33c2fbc
change icon to a megaphone
2020-09-16 11:53:54 +03:00
Absturztaube
7fa2dfecc6
Merge branch 'direct-conversations' of https://git.pleroma.social/eugenijm/pleroma-fe into direct-conversations
2020-07-08 19:16:44 +02: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
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
eugenijm
855f36eeda
wip
2020-05-29 09:43:52 +03:00
eugenijm
804cf3abc5
WIP: Chats
2020-05-29 09:43:52 +03:00
Henry Jameson
a6ca923a76
icons update
2020-05-25 16:10:43 +03: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
Shpuld Shpludson
f4676e17d3
Merge branch 'develop' into 'feature/copy-link'
...
# Conflicts:
# static/fontello.json
2020-05-08 08:20:03 +00:00
eugenijm
01b07f01e9
Add support for follow request notifications
2020-04-30 09:58:55 +03:00
Mark Felder
8c5946b728
Add button in 3dot menu to copy status link to clipboard
2020-03-30 12:39:28 -05:00
Shpuld Shpuldson
1fb91b1795
remove bloat from themes
2020-02-22 10:34:54 +02:00
Shpuld Shpuldson
b5c6b77ca8
update using variables
2020-02-22 10:03:16 +02:00
Shpuld Shpludson
8c454b9456
Apply suggestion to static/themes/pleroma-dark.json
2020-02-21 14:09:31 +00:00
