Shpuld Shpludson
|
47c56ffa1c
|
Merge branch 'feat/relationship-refactor' into 'develop'
Refactor: make relationships separate from users
Closes #819
See merge request pleroma/pleroma-fe!1091
|
2020-05-08 09:14:26 +00: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
|
ec7bee6bd6
|
Merge branch 'feature/copy-link' into 'develop'
Copy status link to clipboard
See merge request pleroma/pleroma-fe!1085
|
2020-05-08 08:33:20 +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 |
|
Shpuld Shpludson
|
2893834095
|
Merge branch 'feat/notification-privacy' into 'develop'
Add notification privacy option to user settings
See merge request pleroma/pleroma-fe!1100
|
2020-05-07 20:34:27 +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 Shpludson
|
9b349b4019
|
Merge branch 'rc/2.0.3' into 'develop'
update MASTER for 2.0.3
See merge request pleroma/pleroma-fe!1098
|
2020-05-02 13:43:22 +00:00 |
|
Shpuld Shpludson
|
2618c1b702
|
Update CHANGELOG.md
|
2020-05-02 16:21:46 +03:00 |
|
Shpuld Shpuldson
|
b095d2e17e
|
don't dismiss a rejected follow request on server
|
2020-05-02 16:21:46 +03:00 |
|
Shpuld Shpuldson
|
20b53d58b7
|
mark single notifs as seen properly on server
|
2020-05-02 16:21:46 +03:00 |
|
Shpuld Shpuldson
|
36dcfa8cc1
|
follow request bugfixes, wrong text, notifs not being marked as read, approving from follow request view
|
2020-05-02 16:21:46 +03:00 |
|
eugenijm
|
ab3c0e8512
|
Add support for follow request notifications
|
2020-05-02 16:21:46 +03:00 |
|
Shpuld Shpludson
|
4d1a674634
|
Update CHANGELOG.md
|
2020-05-02 16:21:46 +03:00 |
|
Shpuld Shpludson
|
372eb723db
|
Update CHANGELOG.md
|
2020-05-02 16:21:46 +03:00 |
|
xenofem
|
fe4282f44b
|
Prioritize custom emoji a lot and boost exact matches to the top
|
2020-05-02 16:21:46 +03:00 |
|
xenofem
|
aef03d53b2
|
Allow emoji suggestions based on a match anywhere in the emoji name, but improve sorting
|
2020-05-02 16:21:46 +03:00 |
|
xenofem
|
eae0bce320
|
Refactor status showing/hiding code for better handling of edge cases and easier comprehension
|
2020-05-02 16:21:46 +03:00 |
|
Karol Kosek
|
c4d1c2131c
|
Fix user names with the RTL char in notifications
|
2020-05-02 16:21:46 +03:00 |
|
Egor Kislitsyn
|
0ba34eeca5
|
Fix pagination
|
2020-05-02 16:21:46 +03:00 |
|
Shpuld Shpludson
|
068abb4d26
|
Update CHANGELOG.md
|
2020-05-02 13:05:45 +00:00 |
|
Shpuld Shpludson
|
5f90b6a384
|
Merge branch 'fix/follow-request-notification-bugfixes' into 'develop'
Fix remaining follow request notif problems
Closes #823
See merge request pleroma/pleroma-fe!1096
|
2020-05-02 11:19:05 +00: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 |
|
Shpuld Shpludson
|
c67e9daf06
|
Merge branch 'follow-request-notification' into 'develop'
Add support for follow request notifications
Closes #823 and #822
See merge request pleroma/pleroma-fe!1093
|
2020-05-01 20:24:25 +00:00 |
|
Shpuld Shpludson
|
af3e69743e
|
Update CHANGELOG.md
|
2020-05-01 19:28:26 +00:00 |
|
Shpuld Shpludson
|
790b8555dc
|
Merge branch 'fix/remove-with_move-param' into 'develop'
Remove with_move param
See merge request pleroma/pleroma-fe!1094
|
2020-05-01 14:41:00 +00:00 |
|
Shpuld Shpuldson
|
02c8a9e314
|
remove with_move param
|
2020-05-01 17:26:07 +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
|
dea7e2f6ac
|
Update CHANGELOG.md
|
2020-04-27 08:09:31 +00: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
|
99d8e16e4d
|
remove with_relationships as it doesn't help
|
2020-04-23 14:11:48 +03:00 |
|
Shpuld Shpuldson
|
ce0a1e7ad1
|
add back missing catch
|
2020-04-23 14:08:33 +03:00 |
|
Shpuld Shpuldson
|
cda298c822
|
remove unused mutation and test for it
|
2020-04-23 11:17:52 +03:00 |
|
Shpuld Shpuldson
|
aa56147322
|
fix follow
|
2020-04-22 15:06:10 +03:00 |
|
Shpuld Shpuldson
|
576ad9750b
|
make tests not fail
|
2020-04-22 00:07:01 +03:00 |
|