Ivan Tashkinov
|
92efb888c7
|
Made follow request notifications non-optional (removed config switch).
|
4 years ago |
|
eugenijm
|
bef34568f0
|
Dismiss the follow request notification on rejection
|
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 |
|
Ivan Tashkinov
|
0cda80f266
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
|
4 years ago |
|
lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
4 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
|
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
|
3965772b26
|
[#1559] Minor change (analysis).
|
5 years ago |
|
Ivan Tashkinov
|
f35c28bf07
|
[#1559] Added / fixed tests for follow / follow_request notifications.
|
5 years ago |
|
Maksim Pechnikov
|
2b7d7bbd2d
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
lain
|
349b9d86dc
|
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
|
5 years ago |
|
Maksim Pechnikov
|
dbcfac11b4
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Alexander Strizhakov
|
f497cf2f7c
|
Merge branch 'develop' into gun
|
5 years ago |
|
Maksim Pechnikov
|
dfd2c74184
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Ivan Tashkinov
|
012d428e1f
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
|
5 years ago |
|
lain
|
1aa8aa7d7f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
|
5 years ago |
|
lain
|
3c2c32b460
|
Merge branch 'remake-remodel' into develop
|
5 years ago |
|
Alexander Strizhakov
|
f9ecb513fa
|
Merge branch 'develop' into gun
|
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 |
|
Alexander Strizhakov
|
f0753eed0f
|
removing try block in tesla request
added mocks for tests which fail with Tesla.Mock.Error
|
5 years ago |
|
Alexander Strizhakov
|
7c0ed9302c
|
unnecessary mock
|
5 years ago |
|
Alexander Strizhakov
|
509c81e4b1
|
Merge branch 'develop' into gun
|
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 |
|
Alexander Strizhakov
|
514c899275
|
adding gun adapter
|
5 years ago |
|
Maksim Pechnikov
|
cd040691bd
|
maked `unread_count` as virtual field
|
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 |
|
Haelwenn (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
5 years ago |
|
Ivan Tashkinov
|
7973cbdb9f
|
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
|
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 |
|
lain
|
e9993acdbb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
|
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 |
|
Egor Kislitsyn
|
1fc28a4b44
|
Add a view for the move notification
|
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 |
|
Ivan Tashkinov
|
c31ddce51e
|
[#1335] Reorganized `users.mutes` as relation to UserMute entity.
|
5 years ago |
|
Ivan Tashkinov
|
3db988250b
|
[#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
|
5 years ago |
|
lain
|
1bd1f62af5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
|
5 years ago |
|
Maksim Pechnikov
|
99cf1ef9be
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Maksim Pechnikov
|
d3fb9e02cc
|
add tests
|
5 years ago |
|
Ivan Tashkinov
|
8cc809e44e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/notification.ex
|
5 years ago |
