Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2bbec33c71
								
							
						 | 
						
							
							
								
								Fix failing tests
							
							
							
							
							
						 | 
						
							2018-12-25 00:29:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								074fa790ba
								
							
						 | 
						
							
							
								
								fix compile warnings
							
							
							
							
							
						 | 
						
							2018-12-09 20:50:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								8b4397c704
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/compat/push-subscriptions
							
							
							
							
							
							
							
							# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock 
							
						 | 
						
							2018-12-06 19:55:58 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								04a48286e6
								
							
						 | 
						
							
							
								
								Add web push support
							
							
							
							
							
						 | 
						
							2018-12-06 19:29:04 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								b3c360ce2c
								
							
						 | 
						
							
							
								
								notification: add fallback get_notified_from_activity()
							
							
							
							
							
						 | 
						
							2018-11-09 09:07:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								cdfdd77e30
								
							
						 | 
						
							
							
								
								notification: implement new Notification.get_notified_from_activity()
							
							
							
							
							
						 | 
						
							2018-11-09 09:01:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								f16c2e0b1b
								
							
						 | 
						
							
							
								
								notification: add Notification.set_read_up_to()
							
							
							
							
							
						 | 
						
							2018-11-06 22:50:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pierrick Brun
								
							 
						 | 
						
							
							
							
							
								
							
							
								89603eda9e
								
							
						 | 
						
							
							
								
								do not create notification for yourself
							
							
							
							
							
						 | 
						
							2018-05-11 11:31:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4afbef39f4
								
							
						 | 
						
							
							
								
								Format the code.
							
							
							
							
							
						 | 
						
							2018-03-30 15:01:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thog
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								59770c3f5c
								
							
						 | 
						
							
							
								
								Fix all compilation warnings
							
							
							
							
							
						 | 
						
							2017-11-19 02:22:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								a743940463
								
							
						 | 
						
							
							
								
								MastoAPI: Implement all streaming functions.
							
							
							
							
							
						 | 
						
							2017-11-16 16:49:51 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								e6a78c6ed0
								
							
						 | 
						
							
							
								
								MastoAPI: Add notification get, clear and dismiss.
							
							
							
							
							
						 | 
						
							2017-11-10 15:24:52 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								632da6c927
								
							
						 | 
						
							
							
								
								Don't create notifications if the user is blocked.
							
							
							
							
							
						 | 
						
							2017-11-02 22:08:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								cda01285f4
								
							
						 | 
						
							
							
								
								Add pagination to notifications.
							
							
							
							
							
						 | 
						
							2017-09-12 09:11:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								464c33e9a1
								
							
						 | 
						
							
							
								
								Add follow notifications.
							
							
							
							
							
						 | 
						
							2017-09-11 20:53:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								3bad294058
								
							
						 | 
						
							
							
								
								Add reblogs to notifications.
							
							
							
							
							
						 | 
						
							2017-09-11 20:43:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								bcce3e5dd2
								
							
						 | 
						
							
							
								
								Add favorites to notifications.
							
							
							
							
							
						 | 
						
							2017-09-11 20:41:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								61adf676d5
								
							
						 | 
						
							
							
								
								Add basic mastodon notification support.
							
							
							
							
							
						 | 
						
							2017-09-11 18:53:19 +02:00 | 
						
						
							
							
							
								
							
							
						 |