Sergey Suprunenko
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								25c69e271a
								
							
						 | 
						
							
							
								
								Make notifications about new statuses from muted threads read
							
							
							
							
							
						 | 
						
							2020-08-17 00:11:33 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0865f36965
								
							
						 | 
						
							
							
								
								Mark notifications about statuses from muted users as read automatically
							
							
							
							
							
						 | 
						
							2020-08-15 15:27:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								80c21100db
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/notification_settings
							
							
							
							
							
						 | 
						
							2020-07-13 13:32:21 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								818f3c2393
								
							
						 | 
						
							
							
								
								test fixes
							
							
							
							
							
						 | 
						
							2020-07-06 09:30:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								028a241b7d
								
							
						 | 
						
							
							
								
								tests fixes
							
							
							
							
							
						 | 
						
							2020-07-06 09:30:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								20c27bef40
								
							
						 | 
						
							
							
								
								renaming back and reject nil on create
							
							
							
							
							
						 | 
						
							2020-07-06 09:30:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								52ff75413a
								
							
						 | 
						
							
							
								
								Apply suggestion to test/notification_test.exs
							
							
							
							
							
						 | 
						
							2020-07-06 09:30:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								086a260c04
								
							
						 | 
						
							
							
								
								Apply suggestion to test/notification_test.exs
							
							
							
							
							
						 | 
						
							2020-07-06 09:30:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8277b29790
								
							
						 | 
						
							
							
								
								Restrict thread statuses that contain user's irreversible filters
							
							
							
							
							
						 | 
						
							2020-07-06 09:30:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5af1bf443d
								
							
						 | 
						
							
							
								
								Skip notifications for statuses that contain an irreversible filtered word
							
							
							
							
							
						 | 
						
							2020-07-06 09:28:22 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c01f4ca07f
								
							
						 | 
						
							
							
								
								Notification: Remove TODO.
							
							
							
							
							
						 | 
						
							2020-06-29 17:52:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								90083a754d
								
							
						 | 
						
							
							
								
								Notifications: Never return nil in the notification list.
							
							
							
							
							
						 | 
						
							2020-06-29 17:48:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd5e797379
								
							
						 | 
						
							
							
								
								Simplify notification filtering settings further
							
							
							
							
							
						 | 
						
							2020-06-26 11:24:28 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								433c01b370
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/notification_settings
							
							
							
							
							
						 | 
						
							2020-06-25 14:26:21 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								b15cfc3d36
								
							
						 | 
						
							
							
								
								Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
							
							
							
							
							
						 | 
						
							2020-06-14 18:27:11 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9189b489ee
								
							
						 | 
						
							
							
								
								Migrations: Move Notification migration code to helper
							
							
							
							
							
						 | 
						
							2020-06-06 15:33:02 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa2ac76510
								
							
						 | 
						
							
							
								
								Notification: Don't break on figuring out the type of old EmojiReactions
							
							
							
							
							
						 | 
						
							2020-06-04 20:40:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								38dce485c4
								
							
						 | 
						
							
							
								
								Notification: Add function to backfill notification types
							
							
							
							
							
						 | 
						
							2020-06-02 14:50:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								805ab86933
								
							
						 | 
						
							
							
								
								Notifications: Make notifications save their type.
							
							
							
							
							
						 | 
						
							2020-06-02 13:24:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c82f657c5
								
							
						 | 
						
							
							
								
								Formatting
							
							
							
							
							
						 | 
						
							2020-05-28 13:22:28 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								9eea800026
								
							
						 | 
						
							
							
								
								Refactor notification settings
							
							
							
							
							
						 | 
						
							2020-05-28 10:16:09 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b8e029b5ea
								
							
						 | 
						
							
							
								
								Notification: Actually preload objects.
							
							
							
							
							
						 | 
						
							2020-05-27 12:41:06 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								23e248694d
								
							
						 | 
						
							
							
								
								Announcements: Fix all tests.
							
							
							
							
							
						 | 
						
							2020-05-21 13:16:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7803a85d2c
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for StatusController
							
							
							
							
							
						 | 
						
							2020-05-13 00:25:21 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
							
							
								
							
							
								e6d8cacf2d
								
							
						 | 
						
							
							
								
								Expand and authorize streams in Streamer directly
							
							
							
							
							
						 | 
						
							2020-05-12 18:04:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								570940a3fd
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/fix-like-notifications' into 'develop'
							
							
							
							
							
							
							
							Notifications: Simplify recipient calculation for some Activities.
See merge request pleroma/pleroma!2486 
							
						 | 
						
							2020-05-08 15:00:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fbcc53760e
								
							
						 | 
						
							
							
								
								Merge branch 'feature/emojireactvalidator' into 'develop'
							
							
							
							
							
							
							
							Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473 
							
						 | 
						
							2020-05-08 10:41:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b078e0567d
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1276-2
							
							
							
							
							
						 | 
						
							2020-05-08 08:51:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef55d24054
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
							
							
							
							
							
						 | 
						
							2020-05-07 18:53:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								7ac0cffb34
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
							
							
							
							
							
						 | 
						
							2020-05-07 15:03:12 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f0c22df226
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
							
							
							
							
							
						 | 
						
							2020-05-07 14:45:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f57fa2a00d
								
							
						 | 
						
							
							
								
								Notifications: Simplify recipient calculation for some Activities.
							
							
							
							
							
							
							
							Fixes the 'getting notfications for other people's posts' bug. 
							
						 | 
						
							2020-05-07 12:43:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
							
							
								
							
							
								9491ba3e49
								
							
						 | 
						
							
							
								
								Streamer rework
							
							
							
							
							
						 | 
						
							2020-05-07 09:13:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a3bb2e5474
								
							
						 | 
						
							
							
								
								Undoing: Move undoing announcements to the pipeline everywhere.
							
							
							
							
							
						 | 
						
							2020-05-05 16:42:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a3071f0231
								
							
						 | 
						
							
							
								
								Undoing: Move undoing likes to the pipeline everywhere.
							
							
							
							
							
						 | 
						
							2020-05-05 15:08:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								db55dc9445
								
							
						 | 
						
							
							
								
								ActivityPub: Remove react_with_emoji.
							
							
							
							
							
						 | 
						
							2020-05-05 12:28:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe7a0d660e
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1276-2
							
							
							
							
							
						 | 
						
							2020-05-04 06:08:49 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								92efb888c7
								
							
						 | 
						
							
							
								
								Made follow request notifications non-optional (removed config switch).
							
							
							
							
							
						 | 
						
							2020-05-01 09:51:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a92c713d9c
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1276-2
							
							
							
							
							
						 | 
						
							2020-05-01 06:21:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								bef34568f0
								
							
						 | 
						
							
							
								
								Dismiss the follow request notification on rejection
							
							
							
							
							
						 | 
						
							2020-04-30 18:38:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b3b1fec4e
								
							
						 | 
						
							
							
								
								added an endpoint for getting unread notification count
							
							
							
							
							
						 | 
						
							2020-04-15 21:19:43 +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 | 
						
						
							
							
							
								
							
							
						 |