Age | Commit message (Collapse) | Author | |
---|---|---|---|
2020-03-31 | Merge branch '1364-notifications-sending-control' into 'develop' | rinpatch | |
[#1364] Ability to opt-out of notifications (in all clients) Closes #1364 See merge request pleroma/pleroma!2301 | |||
2020-03-02 | Bump copyright years of files changed after 2020-01-07 | Haelwenn (lanodan) Monnier | |
Done via the following command: git diff fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' | |||
2020-02-06 | EmojiReactions: Rename to EmojiReacts | Lain Soykaf | |
2020-01-22 | Notifications: Add emoji reaction notifications | lain | |
2019-12-09 | Merge branch 'exclude-visibilities-for-like-notifications' into 'develop' | lain | |
Fix exclude_visibilities filter for followers-only Like notifications See merge request pleroma/pleroma!1957 | |||
2019-12-08 | Merge branch 'develop' into issue/1342 | Maksim Pechnikov | |
2019-12-08 | Merge branch 'improve-move-notificaions-api' into 'develop' | rinpatch | |
Add `with_move` query param to the notifications API See merge request pleroma/pleroma!2032 | |||
2019-12-05 | Merge branch 'develop' into issue/1342 | Maksim Pechnikov | |
2019-12-04 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex | |||
2019-12-03 | Add `with_move` query param to the notifications API | Egor Kislitsyn | |
2019-11-28 | added User.NotificationSetting struct | Maksim Pechnikov | |
2019-11-20 | [#1335] User AP ID relations fetching performance optimizations. | Ivan Tashkinov | |
2019-11-19 | [#1335] Implemented notification mutes and reblog mutes as ↵ | Ivan Tashkinov | |
UserRelationships. User to UserRelationship relations and functions refactoring. | |||
2019-11-12 | Add a notification for Move activities | Egor Kislitsyn | |
2019-11-11 | Fix exclude_visibilities filter for followers-only Like notifications | eugenijm | |
2019-11-10 | [#1335] User: refactored :blocks field into :blocked_users relation. | Ivan Tashkinov | |
Introduced UserBlock. | |||
2019-10-23 | [#1304] Adjusted User.Info references from Notification. | Ivan Tashkinov | |
2019-10-23 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1304-user-info-deprecation # Conflicts: # lib/pleroma/notification.ex | |||
2019-10-21 | Do not include notifications from blocked users when with_muted is set | rinpatch | |
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-20 | Merge 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-14 | Mastodon API: Add `exclude_visibilities` parameter to the timeline and ↵ | eugenijm | |
notification endpoints | |||
2019-09-29 | Revert subscription refactoring. | rinpatch | |
As discussed in pleroma-meta#2 This reverts commit eb9aa7aa1095de150d036839c78c402019efb4b1, reversing changes made to c4fbb56984d8f86df948cfd9b0f7c081d688c365. | |||
2019-09-26 | Merge develop | Roman Chvanikov | |
2019-09-25 | Replace `Pleroma.FlakeId` with `flake_id` hex package | Egor Kislitsyn | |
2019-09-16 | Merge develop | Roman Chvanikov | |
2019-09-16 | Revert "Merge branch 'revert-4fabf83a' into 'develop'" | Egor Kislitsyn | |
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8. | |||
2019-09-16 | Revert "Merge branch 'streamer-refactoring' into 'develop'" | kaniini | |
This reverts merge request !1653 | |||
2019-09-16 | Streamer refactoring | Steven Fuchs | |
2019-09-13 | Separate Subscription Notifications from regular Notifications | Roman Chvanikov | |
2019-09-04 | Apply suggestion to lib/pleroma/notification.ex | rinpatch | |
2019-09-04 | Extend `/api/pleroma/notifications/read` to mark multiple notifications | rinpatch | |
as read and make it respond with Mastoapi entities | |||
2019-07-16 | Merge develop | Roman Chvanikov | |
2019-07-15 | query fix | Alex S | |
2019-07-14 | Make opts optional in Pleroma.Notification.for_user_query/2 | Roman Chvanikov | |
2019-07-14 | Merge branch 'develop' into feature/digest-email | Roman Chvanikov | |
2019-07-14 | Feature/1072 muting notifications | Alexander Strizhakov | |
2019-06-29 | Resolve conflicts | Roman Chvanikov | |
2019-06-22 | notifications: fix notification generation for non-create activities | William 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 stream | Maksim | |
2019-06-03 | Merge branch 'develop' into feature/digest-email | Mark Felder | |
2019-06-03 | Merge branch 'develop' into feature/polls-2-electric-boogalo | rinpatch | |
2019-06-01 | Add poll votes | rinpatch | |
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-29 | Merge develop | Roman Chvanikov | |
2019-05-26 | notification: remove local/remote match rules (too complicated) | William Pitcock | |
2019-05-25 | notification: add non_follows/non_followers notification control settings | William Pitcock | |
2019-04-30 | Merge develop | Roman Chvanikov | |
2019-04-25 | Merge branch 'develop' into feature/disable-account | Egor Kislitsyn | |
2019-04-22 | Use `User.get_cached*` everywhere | Egor | |