sadposter
|
f99240df69
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
|
2020-06-06 18:30:38 +01:00 |
|
lain
|
2aabd8ed1a
|
StillImage: Make it work properly in both firefox and chrome.
|
2020-06-05 17:55:19 +02:00 |
|
Shpuld Shpludson
|
63f237d736
|
Merge branch '848-change-emoji-reaction-defaults' into 'develop'
ReactButton: Change the combined emoji (heart) to a simple one.
Closes #848
See merge request pleroma/pleroma-fe!1131
|
2020-06-05 15:36:15 +00:00 |
|
lain
|
ba4c189c53
|
ReactButton: Change the combined emoji (heart) to a simple one.
|
2020-06-05 17:26:13 +02:00 |
|
lain
|
c4c5568b98
|
Linting fixes.
|
2020-06-05 13:51:47 +02:00 |
|
lain
|
282e10e3be
|
Settings: Keep a local version of the mutedWordsString
Without this it was impossible to use newlines
|
2020-06-05 13:42:39 +02:00 |
|
HJ
|
c678756eba
|
Merge branch '748-hashtag-link-fixes' into 'develop'
StatusContent: Try to get hashtag from dataset first.
Closes #748
See merge request pleroma/pleroma-fe!1128
|
2020-06-04 16:06:33 +00:00 |
|
lain
|
cb99dc2b27
|
MediaModal: Close on browser navigation events.
|
2020-06-04 16:30:28 +02:00 |
|
lain
|
d872d55832
|
StatusContent: Try to get hashtag from dataset first.
|
2020-06-04 15:50:44 +02:00 |
|
sadposter
|
78db835fe1
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
|
2020-05-20 17:16:21 +01:00 |
|
sadposter
|
b4ca079bdb
|
dd nsfw
|
2020-05-20 17:15:34 +01:00 |
|
Shpuld Shpludson
|
0b44a5b601
|
Merge branch 'fix/its-me-elements' into 'develop'
Show "it's you" label and hide follow btn for current user
Closes #839 and #827
See merge request pleroma/pleroma-fe!1111
|
2020-05-20 14:48:52 +00:00 |
|
Sergey Suprunenko
|
db8dd1223c
|
Make a condition clear and unambiguous
|
2020-05-14 09:27:58 +02:00 |
|
Sergey Suprunenko
|
e50857d0ff
|
Show "it's you" label and hide follow btn for current user
|
2020-05-14 09:25:07 +02:00 |
|
Shpuld Shpuldson
|
8e39971098
|
add with_relationships where necessary
|
2020-05-13 17:48:31 +03:00 |
|
sadposter
|
10153e692e
|
ihba updates
|
2020-05-08 14:38:46 +01:00 |
|
Shpuld Shpludson
|
1186205583
|
Merge branch 'develop' into 'feat/relationship-refactor'
# Conflicts:
# src/components/notification/notification.js
|
2020-05-08 08:35:30 +00:00 |
|
Shpuld Shpludson
|
921eedfd84
|
Merge branch 'feat/status-content-separation' into 'develop'
Refactor: Separate status content from status
See merge request pleroma/pleroma-fe!1092
|
2020-05-08 08:33:55 +00:00 |
|
Shpuld Shpludson
|
f4676e17d3
|
Merge branch 'develop' into 'feature/copy-link'
# Conflicts:
# static/fontello.json
|
2020-05-08 08:20:03 +00:00 |
|
Shpuld Shpuldson
|
ddc3b86d24
|
fix popover not closing on pressing the buttons
|
2020-05-08 10:46:00 +03:00 |
|
Mark Felder
|
41fc26869f
|
Correctly resolve the URI of the server
|
2020-05-07 16:33:21 -05:00 |
|
Shpuld Shpuldson
|
93baa8b664
|
fix gap when not logged in
|
2020-05-08 00:10:49 +03:00 |
|
Shpuld Shpludson
|
f40de85b92
|
Merge branch 'fix/signup-without-email' into 'develop'
Permit signup without email
See merge request pleroma/pleroma-fe!1072
|
2020-05-07 21:04:59 +00:00 |
|
Mark Felder
|
b3003d4e8d
|
Add notification privacy option to user settings
|
2020-05-06 11:46:40 -05:00 |
|
Shpuld Shpuldson
|
f7f8a579fa
|
make email validation conditional work
|
2020-05-04 12:56:39 +03:00 |
|
Shpuld Shpuldson
|
101eebb40b
|
Merge branch 'develop' into fix/signup-without-email
|
2020-05-04 11:05:05 +03:00 |
|
Shpuld Shpuldson
|
92ccaa97bb
|
don't dismiss a rejected follow request on server
|
2020-05-02 11:51:39 +03:00 |
|
Shpuld Shpuldson
|
75519223f9
|
mark single notifs as seen properly on server
|
2020-05-02 10:52:57 +03:00 |
|
Shpuld Shpuldson
|
406fdd8ede
|
follow request bugfixes, wrong text, notifs not being marked as read, approving from follow request view
|
2020-05-02 10:19:47 +03:00 |
|
eugenijm
|
01b07f01e9
|
Add support for follow request notifications
|
2020-04-30 09:58:55 +03:00 |
|
Shpuld Shpuldson
|
7a25160ddc
|
Separate status content from status like in direct conversations mr
|
2020-04-27 12:53:04 +03:00 |
|
Shpuld Shpludson
|
fe16b6259e
|
Merge branch 'feature-emoji-length-sorting' into 'develop'
Allow emoji suggestions based on a match anywhere in the emoji name, but improve sorting
Closes #135
See merge request pleroma/pleroma-fe!1061
|
2020-04-27 08:01:57 +00:00 |
|
Shpuld Shpludson
|
d32159d69d
|
Merge branch 'fix/status-showing-hiding' into 'develop'
Refactor status showing/hiding code for better handling of edge cases and easier comprehension
Closes #779
See merge request pleroma/pleroma-fe!1073
|
2020-04-27 07:47:02 +00:00 |
|
Shpuld Shpuldson
|
8b1aa593a4
|
fix status mutes
|
2020-04-27 10:06:17 +03:00 |
|
Shpuld Shpuldson
|
af9492977a
|
add back mute prediction, add getter for relationships
|
2020-04-24 18:53:17 +03:00 |
|
Shpuld Shpuldson
|
f6fce92cf7
|
last lint warning
|
2020-04-23 14:48:15 +03:00 |
|
Shpuld Shpuldson
|
c476193fd9
|
minor lint fixes
|
2020-04-23 14:44:55 +03:00 |
|
Shpuld Shpuldson
|
ca00e93b60
|
minor fixes
|
2020-04-23 14:27:27 +03:00 |
|
Shpuld Shpuldson
|
aa56147322
|
fix follow
|
2020-04-22 15:06:10 +03:00 |
|
Shpuld Shpuldson
|
4b7007bc7d
|
fix mistakes
|
2020-04-21 23:56:48 +03:00 |
|
Shpuld Shpuldson
|
6bb75a3a6d
|
make relationships separate from users
|
2020-04-21 23:27:51 +03:00 |
|
Karol Kosek
|
2fbb94fe5c
|
Fix user names with the RTL char in notifications
|
2020-04-18 19:45:24 +02:00 |
|
Mark Felder
|
8c5946b728
|
Add button in 3dot menu to copy status link to clipboard
|
2020-03-30 12:39:28 -05:00 |
|
Alex
|
b9820b84a1
|
Prevent overflow for long usernames/domains
|
2020-03-14 19:41:38 +00:00 |
|
HJ
|
ed0b240e29
|
Merge branch 'fix/captcha-input' into 'develop'
Fix captcha input and disable ALL the helpers
Closes #778
See merge request pleroma/pleroma-fe!1071
|
2020-03-11 16:40:31 +00:00 |
|
Shpuld Shpuldson
|
ab4005add5
|
add status unavailable message when status can't be loaded in status preview
|
2020-03-02 08:35:57 +02:00 |
|
Shpuld Shpludson
|
31225f5d14
|
Fix/popover performance
|
2020-02-28 16:39:47 +00:00 |
|
xenofem
|
7fa5eb07dd
|
Refactor status showing/hiding code for better handling of edge cases and easier comprehension
|
2020-02-24 18:10:15 -05:00 |
|
Mark Felder
|
39e3917118
|
Remove unneccessary nested
|
2020-02-24 11:23:16 -06:00 |
|
Mark Felder
|
86561592d0
|
First attempt at not requiring email address for registration
|
2020-02-24 11:19:00 -06:00 |
|