aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/notification.ex
AgeCommit message (Collapse)Author
2019-11-11clean sql queryMaksim Pechnikov
2019-11-10[#1335] User: refactored :blocks field into :blocked_users relation.Ivan Tashkinov
Introduced UserBlock.
2019-10-24add testMaksim Pechnikov
2019-10-24Merge branch 'develop' into issue/1276Maksim Pechnikov
2019-10-23[#1304] Adjusted User.Info references from Notification.Ivan Tashkinov
2019-10-23Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/notification.ex
2019-10-23added update unread_count for notificationsMaksim Pechnikov
2019-10-21Do not include notifications from blocked users when with_muted is setrinpatch
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-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
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
2019-10-20[#1304] Moved remaining fields from User.Info to User.Ivan Tashkinov
Misc. fixes / improvements.
2019-10-16[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.Ivan Tashkinov
2019-10-14Mastodon API: Add `exclude_visibilities` parameter to the timeline and ↵eugenijm
notification endpoints
2019-09-29Revert subscription refactoring.rinpatch
As discussed in pleroma-meta#2 This reverts commit eb9aa7aa1095de150d036839c78c402019efb4b1, reversing changes made to c4fbb56984d8f86df948cfd9b0f7c081d688c365.
2019-09-26Merge developRoman Chvanikov
2019-09-25Replace `Pleroma.FlakeId` with `flake_id` hex packageEgor Kislitsyn
2019-09-16Merge developRoman Chvanikov
2019-09-16Revert "Merge branch 'revert-4fabf83a' into 'develop'"Egor Kislitsyn
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
2019-09-16Revert "Merge branch 'streamer-refactoring' into 'develop'"kaniini
This reverts merge request !1653
2019-09-16Streamer refactoringSteven Fuchs
2019-09-13Separate Subscription Notifications from regular NotificationsRoman Chvanikov
2019-09-04Apply suggestion to lib/pleroma/notification.exrinpatch
2019-09-04Extend `/api/pleroma/notifications/read` to mark multiple notificationsrinpatch
as read and make it respond with Mastoapi entities
2019-07-16Merge developRoman Chvanikov
2019-07-15query fixAlex S
2019-07-14Make opts optional in Pleroma.Notification.for_user_query/2Roman Chvanikov
2019-07-14Merge branch 'develop' into feature/digest-emailRoman Chvanikov
2019-07-14Feature/1072 muting notificationsAlexander Strizhakov
2019-06-29Resolve conflictsRoman Chvanikov
2019-06-22notifications: fix notification generation for non-create activitiesWilliam Pitcock
in 300d94c62, an Object.normalize() call was introduced. calling Object.normalize() on an activity with a non-object URI (say, a user) causes Really Bad Things to happen. so don't do that.
2019-06-16[#570] add user:notification streamMaksim
2019-06-03Merge branch 'develop' into feature/digest-emailMark Felder
2019-06-03Merge branch 'develop' into feature/polls-2-electric-boogalorinpatch
2019-06-01Add poll votesrinpatch
Also in this commit by accident: - Fix query ordering causing exclude_poll_votes to not work - Do not create notifications for Answer objects
2019-05-29Merge developRoman Chvanikov
2019-05-26notification: remove local/remote match rules (too complicated)William Pitcock
2019-05-25notification: add non_follows/non_followers notification control settingsWilliam Pitcock
2019-04-30Merge developRoman Chvanikov
2019-04-25Merge branch 'develop' into feature/disable-accountEgor Kislitsyn
2019-04-22Use `User.get_cached*` everywhereEgor
2019-04-22Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-04-19Add Notification.for_user_since/2Roman Chvanikov
2019-04-14Update updated_at field on notification readRoman Chvanikov
2019-04-12adding destroy multiple for mastofeAlexander Strizhakov
2019-04-11move user disable into deactivationEgor Kislitsyn
2019-04-11Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-04-10Merge branch 'develop' into feature/user-status-subscriptionsSadposter
2019-04-05Add notification checksSadposter
2019-03-28Add PUT /api/pleroma/notification_settings endpointeugenijm
2019-03-28Notification controlseugenijm
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
2019-03-23notification: formattingWilliam Pitcock
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 23:17:51 +0000