Ivan Tashkinov
|
bb5d0eafa4
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# CHANGELOG.md
|
2020-04-21 08:20:50 +03:00 |
|
Ivan Tashkinov
|
0cda80f266
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
|
2020-04-14 20:10:02 +03:00 |
|
lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
2020-04-14 16:32:22 +00:00 |
|
Ivan Tashkinov
|
650853fc89
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
|
2020-04-14 11:58:38 +03:00 |
|
Ivan Tashkinov
|
c556efb761
|
[#1364] Enabled notifications on followed domain-blocked users' activities.
|
2020-04-12 21:53:03 +03:00 |
|
Ivan Tashkinov
|
88b16fdfb7
|
[#1364] Disabled notifications on activities from blocked domains.
|
2020-04-11 16:01:09 +03:00 |
|
Ivan Tashkinov
|
3965772b26
|
[#1559] Minor change (analysis).
|
2020-04-08 21:33:37 +03:00 |
|
Ivan Tashkinov
|
f35c28bf07
|
[#1559] Added / fixed tests for follow / follow_request notifications.
|
2020-04-08 21:26:22 +03:00 |
|
Maksim Pechnikov
|
2b7d7bbd2d
|
Merge branch 'develop' into issue/1276
|
2020-04-07 14:09:43 +03:00 |
|
lain
|
349b9d86dc
|
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
|
2020-04-06 11:59:01 +00:00 |
|
Maksim Pechnikov
|
dbcfac11b4
|
Merge branch 'develop' into issue/1276
|
2020-04-02 14:47:17 +03:00 |
|
Alexander Strizhakov
|
f497cf2f7c
|
Merge branch 'develop' into gun
|
2020-03-30 12:15:23 +03:00 |
|
Maksim Pechnikov
|
dfd2c74184
|
Merge branch 'develop' into issue/1276
|
2020-03-29 06:57:34 +03:00 |
|
Ivan Tashkinov
|
012d428e1f
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
|
2020-03-25 09:05:17 +03:00 |
|
lain
|
1aa8aa7d7f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
|
2020-03-20 14:52:58 +01:00 |
|
lain
|
3c2c32b460
|
Merge branch 'remake-remodel' into develop
|
2020-03-19 18:00:55 +01:00 |
|
Alexander Strizhakov
|
f9ecb513fa
|
Merge branch 'develop' into gun
|
2020-03-18 14:08:21 +03:00 |
|
Ivan Tashkinov
|
7438833685
|
[#1364] Improved notification-related tests.
|
2020-03-16 21:58:10 +03:00 |
|
Alexander Strizhakov
|
f3791add99
|
removing with_move parameter
|
2020-03-16 20:07:45 +03:00 |
|
Ivan Tashkinov
|
7c8003c3fc
|
[#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
|
2020-03-15 21:00:12 +03:00 |
|
Maksim Pechnikov
|
edb659dc57
|
Merge branch 'develop' into issue/1276
|
2020-03-08 14:10:59 +03:00 |
|
Alexander Strizhakov
|
f0753eed0f
|
removing try block in tesla request
added mocks for tests which fail with Tesla.Mock.Error
|
2020-03-05 17:31:06 +03:00 |
|
Alexander Strizhakov
|
7c0ed9302c
|
unnecessary mock
|
2020-03-03 16:46:20 +03:00 |
|
Alexander Strizhakov
|
509c81e4b1
|
Merge branch 'develop' into gun
|
2020-03-03 10:08:07 +03:00 |
|
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\/>'
|
2020-03-02 06:08:45 +01:00 |
|
Alexander Strizhakov
|
514c899275
|
adding gun adapter
|
2020-02-18 08:19:01 +03:00 |
|
Maksim Pechnikov
|
cd040691bd
|
maked unread_count as virtual field
|
2020-02-10 09:01:45 +03:00 |
|
Maksim Pechnikov
|
e442ea5722
|
Merge branch 'develop' into issue/1276
|
2020-01-27 15:20:47 +03:00 |
|
lain
|
615b72238e
|
Notifications: Add emoji reaction notifications
|
2020-01-22 20:06:12 +01:00 |
|
Haelwenn (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
2020-01-20 12:17:14 +01:00 |
|
Ivan Tashkinov
|
7973cbdb9f
|
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
|
2019-12-15 22:32:42 +03:00 |
|
Maksim Pechnikov
|
95e6a2acd9
|
Merge branch 'develop' into issue/1342
|
2019-12-08 21:25:26 +03:00 |
|
Maksim Pechnikov
|
6fbafb1cdc
|
Merge branch 'develop' into issue/1276
|
2019-12-08 20:14:28 +03:00 |
|
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
|
2019-12-08 13:07:05 +00:00 |
|
Maksim Pechnikov
|
3fe7a1fd35
|
Merge branch 'develop' into issue/1342
|
2019-12-05 15:46:27 +03:00 |
|
Maksim Pechnikov
|
49bb0a130f
|
Merge branch 'develop' into issue/1276
|
2019-12-05 12:22:19 +03:00 |
|
Ivan Tashkinov
|
30caf3e51e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
|
2019-12-04 18:56:31 +03:00 |
|
lain
|
e9993acdbb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
|
2019-12-04 16:35:59 +01:00 |
|
Egor Kislitsyn
|
624e720aa4
|
Add with_move query param to the notifications API
|
2019-12-03 22:13:38 +07:00 |
|
Maksim Pechnikov
|
a52da55eb9
|
added User.NotificationSetting struct
|
2019-11-28 22:08:30 +03:00 |
|
Egor Kislitsyn
|
1fc28a4b44
|
Add a view for the move notification
|
2019-11-27 17:52:02 +07:00 |
|
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
2019-11-19 23:22:10 +03:00 |
|
Ivan Tashkinov
|
c31ddce51e
|
[#1335] Reorganized users.mutes as relation to UserMute entity.
|
2019-11-15 21:38:54 +03:00 |
|
Ivan Tashkinov
|
3db988250b
|
[#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
|
2019-11-10 16:30:21 +03:00 |
|
lain
|
1bd1f62af5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
|
2019-11-05 15:21:00 +01:00 |
|
Maksim Pechnikov
|
99cf1ef9be
|
Merge branch 'develop' into issue/1276
|
2019-10-24 09:23:59 +03:00 |
|
Maksim Pechnikov
|
d3fb9e02cc
|
add tests
|
2019-10-23 22:48:04 +03:00 |
|
Ivan Tashkinov
|
8cc809e44e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/notification.ex
|
2019-10-23 17:22:42 +03:00 |
|
Maksim Pechnikov
|
9a4afbd2a0
|
added update unread_count for notifications
|
2019-10-23 11:22:48 +03:00 |
|
rinpatch
|
2dbee29cf5
|
Do not include notifications from blocked users when with_muted is set
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
|
2019-10-21 19:27:38 +03:00 |
|