rinpatch
|
570940a3fd
|
Merge branch 'bugfix/fix-like-notifications' into 'develop'
Notifications: Simplify recipient calculation for some Activities.
See merge request pleroma/pleroma!2486
|
4 years ago |
|
lain
|
8ae4d64d47
|
Apply suggestion to lib/pleroma/notification.ex
|
4 years ago |
|
lain
|
f57fa2a00d
|
Notifications: Simplify recipient calculation for some Activities.
Fixes the 'getting notfications for other people's posts' bug.
|
4 years ago |
|
Maksim Pechnikov
|
bd261309cc
|
added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`
|
4 years ago |
|
Maksim Pechnikov
|
fe7a0d660e
|
Merge branch 'develop' into issue/1276-2
|
4 years ago |
|
Ivan Tashkinov
|
92efb888c7
|
Made follow request notifications non-optional (removed config switch).
|
4 years ago |
|
Maksim Pechnikov
|
a92c713d9c
|
Merge branch 'develop' into issue/1276-2
|
4 years ago |
|
eugenijm
|
bef34568f0
|
Dismiss the follow request notification on rejection
|
4 years ago |
|
Ivan Tashkinov
|
b03aeae8b9
|
Apply suggestion to lib/pleroma/notification.ex
|
4 years ago |
|
Ivan Tashkinov
|
bb5d0eafa4
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Maksim Pechnikov
|
4b3b1fec4e
|
added an endpoint for getting unread notification count
|
4 years ago |
|
Ivan Tashkinov
|
f7e623c11c
|
[#1364] Resolved merge conflicts with `develop`.
|
5 years ago |
|
Ivan Tashkinov
|
0cda80f266
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
|
5 years ago |
|
lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
5 years ago |
|
Ivan Tashkinov
|
650853fc89
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
|
5 years ago |
|
Ivan Tashkinov
|
99b0bc1989
|
[#1364] Resolved merge conflicts with `develop`. Refactoring.
|
5 years ago |
|
Ivan Tashkinov
|
c556efb761
|
[#1364] Enabled notifications on followed domain-blocked users' activities.
|
5 years ago |
|
Ivan Tashkinov
|
88b16fdfb7
|
[#1364] Disabled notifications on activities from blocked domains.
|
5 years ago |
|
Ivan Tashkinov
|
1a4875adfa
|
[#1559] Support for "follow_request" notifications (configurable).
(Not currently supported by PleromaFE, thus disabled by default).
|
5 years ago |
|
Maksim Pechnikov
|
dfd2c74184
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Ivan Tashkinov
|
3fa3d45dbe
|
[#1364] Minor improvements / comments.
Further fixes of incorrect usage of "relations" as a short form of "relationships".
|
5 years ago |
|
Ivan Tashkinov
|
012d428e1f
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
|
5 years ago |
|
Ivan Tashkinov
|
e743c22329
|
Fixed incorrect usage of "relations" as a short form of "relationships".
|
5 years ago |
|
Ivan Tashkinov
|
7438833685
|
[#1364] Improved notification-related tests.
|
5 years ago |
|
Alexander Strizhakov
|
f3791add99
|
removing with_move parameter
|
5 years ago |
|
Ivan Tashkinov
|
7c8003c3fc
|
[#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
|
5 years ago |
|
Maksim Pechnikov
|
edb659dc57
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
5 years ago |
|
Maksim Pechnikov
|
cd040691bd
|
maked `unread_count` as virtual field
|
5 years ago |
|
Maksim Pechnikov
|
b87533760b
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Lain Soykaf
|
8a79f20c21
|
EmojiReactions: Rename to EmojiReacts
|
5 years ago |
|
Maksim Pechnikov
|
e442ea5722
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
lain
|
615b72238e
|
Notifications: Add emoji reaction notifications
|
5 years ago |
|
lain
|
b3c80b8404
|
Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
Fix exclude_visibilities filter for followers-only Like notifications
See merge request pleroma/pleroma!1957
|
5 years ago |
|
Maksim Pechnikov
|
95e6a2acd9
|
Merge branch 'develop' into issue/1342
|
5 years ago |
|
Maksim Pechnikov
|
6fbafb1cdc
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
rinpatch
|
8404f8c8fb
|
Merge branch 'improve-move-notificaions-api' into 'develop'
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
|
5 years ago |
|
Maksim Pechnikov
|
3fe7a1fd35
|
Merge branch 'develop' into issue/1342
|
5 years ago |
|
Maksim Pechnikov
|
49bb0a130f
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Ivan Tashkinov
|
30caf3e51e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
|
Egor Kislitsyn
|
624e720aa4
|
Add `with_move` query param to the notifications API
|
5 years ago |
|
Maksim Pechnikov
|
a52da55eb9
|
added User.NotificationSetting struct
|
5 years ago |
|
Ivan Tashkinov
|
555edd01ab
|
[#1335] User AP ID relations fetching performance optimizations.
|
5 years ago |
|
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
5 years ago |
|
Maksim Pechnikov
|
b5b62f42b2
|
update Marker.multi_set_unread_count
|
5 years ago |
|
Egor Kislitsyn
|
27cd1374e3
|
Add a notification for Move activities
|
5 years ago |
|
eugenijm
|
f86a7d5d8b
|
Fix exclude_visibilities filter for followers-only Like notifications
|
5 years ago |
|
Maksim Pechnikov
|
ddbfc995ac
|
clean sql query
|
5 years ago |
|
Ivan Tashkinov
|
3db988250b
|
[#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
|
5 years ago |
|
Maksim Pechnikov
|
922e3d082c
|
add test
|
5 years ago |
