99cf1ef9be
Merge branch 'develop' into issue/1276
5 years ago
065e9fac12
[ #1304 ] Adjusted User.Info references from Notification.
5 years ago
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
9a4afbd2a0
added update unread_count for notifications
5 years ago
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.
5 years ago
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
5 years ago
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
5 years ago
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
5 years ago
b4b147000c
Merge develop
5 years ago
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
76c3e290fc
Merge develop
5 years ago
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
5 years ago
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
aab264db82
Streamer refactoring
5 years ago
0bd2b85edb
Separate Subscription Notifications from regular Notifications
5 years ago
7c3838090f
Apply suggestion to lib/pleroma/notification.ex
5 years ago
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
5 years ago
9bca70b10a
Merge develop
5 years ago
33fd4c0ed7
query fix
5 years ago
168dc97c37
Make opts optional in Pleroma.Notification.for_user_query/2
5 years ago
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
e7c39b7ac8
Feature/1072 muting notifications
5 years ago
657277ffc0
Resolve conflicts
5 years ago
6426301407
notifications: fix notification generation for non-create activities
...
in 300d94c62
5 years ago
a04bf131e0
[ #570 ] add user:notification stream
5 years ago
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
300d94c628
Add poll votes
...
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
5 years ago
ce47017c89
Merge develop
5 years ago
750ede5764
notification: remove local/remote match rules (too complicated)
5 years ago
4030837d91
notification: add non_follows/non_followers notification control settings
5 years ago
0f0cc2703b
Merge develop
5 years ago
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
b9cdf6d3b9
Use `User.get_cached*` everywhere
5 years ago
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
aeafa0b2ef
Add Notification.for_user_since/2
6 years ago
dc21181f65
Update updated_at field on notification read
6 years ago
711ade961e
adding destroy multiple for mastofe
6 years ago
db4badc6aa
move user disable into deactivation
6 years ago
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
007762e767
Add notification checks
6 years ago
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
55d086b520
Notification controls
...
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
6 years ago
aabcecb269
notification: formatting
6 years ago
9a06d9f6e8
notification: preload child objects
6 years ago
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
6 years ago
43fb03be5a
Allow to mark a single notification as read
6 years ago
Maksim Pechnikov