Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								70e4b86250 
								
							 
						 
						
							
							
								
								Make notifs view work for reports  
							
							... 
							
							
							
							* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet) 
							
						 
						
							2020-11-13 13:35:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d91c4feebe 
								
							 
						 
						
							
							
								
								Notification: Small refactor.  
							
							
							
						 
						
							2020-08-31 11:02:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f0fefc4f5c 
								
							 
						 
						
							
							
								
								marks notifications as read after mute  
							
							
							
						 
						
							2020-08-28 18:17:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								29fa75d00d 
								
							 
						 
						
							
							
								
								Notification: For follows, notify the followed.  
							
							
							
						 
						
							2020-07-08 14:29:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20c27bef40 
								
							 
						 
						
							
							
								
								renaming back and reject nil on create  
							
							
							
						 
						
							2020-07-06 09:30:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6558f31cda 
								
							 
						 
						
							
							
								
								don't filter notifications for follow and move types  
							
							
							
						 
						
							2020-07-06 09:30:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5af1bf443d 
								
							 
						 
						
							
							
								
								Skip notifications for statuses that contain an irreversible filtered word  
							
							
							
						 
						
							2020-07-06 09:28:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								09c5991f82 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/notification.ex  
							
							
							
						 
						
							2020-06-29 16:04:14 +00: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 
								
							 
						 
						
							
							
							
							
								
							
							
								fc04a138d4 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/notification.ex  
							
							
							
						 
						
							2020-06-08 20:01:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								40fc4e974e 
								
							 
						 
						
							
							
								
								Notfication: Add validation of notification types  
							
							
							
						 
						
							2020-06-06 16:59:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9189b489ee 
								
							 
						 
						
							
							
								
								Migrations: Move Notification migration code to helper  
							
							
							
						 
						
							2020-06-06 15:33:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9fa3f0b156 
								
							 
						 
						
							
							
								
								Notification: Change type of type to an enum.  
							
							
							
						 
						
							2020-06-06 13:08:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								115d08a754 
								
							 
						 
						
							
							
								
								Pipeline: Add a side effects step after the transaction finishes  
							
							... 
							
							
							
							This is to run things like streaming notifications out, which will
sometimes need data that is created by the transaction, but is
streamed out asynchronously. 
							
						 
						
							2020-06-05 16:47: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 
								
							 
						 
						
							
							
							
							
								
							
							
								e46aecda55 
								
							 
						 
						
							
							
								
								Notification: Fix notifications backfill for compacted activities  
							
							
							
						 
						
							2020-06-03 20:51:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2c6ebe709a 
								
							 
						 
						
							
							
								
								Credo fixes  
							
							
							
						 
						
							2020-06-02 15:14:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6cd2fa2a4c 
								
							 
						 
						
							
							
								
								Migrations: Add a migration to backfill notification types.  
							
							
							
						 
						
							2020-06-02 15:13:19 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								af6d01ec93 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-29 12:36:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9eea800026 
								
							 
						 
						
							
							
								
								Refactor notification settings  
							
							
							
						 
						
							2020-05-28 10:16:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d35be02e70 
								
							 
						 
						
							
							
								
								Merge branch 'refactor-add-mention-step-one' into 'develop'  
							
							... 
							
							
							
							Fix ObjectView calling into strange functions
Closes  #1807 
See merge request pleroma/pleroma!2580  
							
						 
						
							2020-05-27 14:17:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b8e029b5ea 
								
							 
						 
						
							
							
								
								Notification: Actually preload objects.  
							
							
							
						 
						
							2020-05-27 12:41:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5fef405208 
								
							 
						 
						
							
							
								
								User: Change signature of get_users_from_set  
							
							
							
						 
						
							2020-05-25 15:06:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c272669909 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-10 12:32:57 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								7637ef4203 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-08 13:13:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8ae4d64d47 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/notification.ex  
							
							
							
						 
						
							2020-05-07 11:01:52 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								bd261309cc 
								
							 
						 
						
							
							
								
								added unread_notifications_count for /api/v1/accounts/verify_credentials  
							
							
							
						 
						
							2020-05-06 15:08:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c40afe5ba0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-04 10:43:20 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6aa116eca7 
								
							 
						 
						
							
							
								
								Create activity handling: Flip it and reverse it  
							
							... 
							
							
							
							Both objects and create activities will now go through the common
pipeline and will be validated. Objects are now created as a side
effect of the Create activity, rolling back a transaction if it's
not possible to insert the object. 
							
						 
						
							2020-04-28 16:26:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b03aeae8b9 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/notification.ex  
							
							
							
						 
						
							2020-04-22 15:31:41 +00: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 
								
							 
						 
						
							
							
							
							
								
							
							
								f7e623c11c 
								
							 
						 
						
							
							
								
								[ #1364 ] Resolved merge conflicts with develop.  
							
							
							
						 
						
							2020-04-14 20:19:08 +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