rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								54029fe212 
								
							 
						 
						
							
							
								
								tests: remove a useless sleep in rate limiter tests  
							
							... 
							
							
							
							It was used to check that authenticated and unauthenticated users have
different limits. Instead of sleeping a super low limit for
unauthenticated users was set, preventing them from doing 5 requests in
the first place. 
							
						 
						
							2019-12-16 01:03:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c8046e1080 
								
							 
						 
						
							
							
								
								tests: Replace 2 second sleep with offseting updated_at  
							
							
							
						 
						
							2019-12-16 00:50:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ba5cc30165 
								
							 
						 
						
							
							
								
								[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.  
							
							
							
						 
						
							2019-11-19 23:22:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3db988250b 
								
							 
						 
						
							
							
								
								[ #1335 ] User: refactored :blocks field into :blocked_users relation.  
							
							... 
							
							
							
							Introduced UserBlock. 
							
						 
						
							2019-11-10 16:30:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								0580654485 
								
							 
						 
						
							
							
								
								Mark the conversations with the blocked user as read and update the blocking user's unread_conversation_count.  
							
							... 
							
							
							
							Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`. 
							
						 
						
							2019-10-26 02:29:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ee04fbc35a 
								
							 
						 
						
							
							
								
								[ #1304 ]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.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 22:29:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								52ed2f8f2d 
								
							 
						 
						
							
							
								
								Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read  
							
							
							
						 
						
							2019-10-19 15:24:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								359dd1890e 
								
							 
						 
						
							
							
								
								Mastodon API: Mark the conversation as read for the author when they send a new direct message  
							
							
							
						 
						
							2019-10-17 16:49:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								8249924485 
								
							 
						 
						
							
							
								
								Mastodon API: Add pleroma.unread_conversation_count to the Account entity  
							
							
							
						 
						
							2019-10-05 20:12:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e07e9cb75e 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !1737  
							
						 
						
							2019-10-05 10:00:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								06d9df79c5 
								
							 
						 
						
							
							
								
								Mastodon API: Add pleroma.unread_conversation_count to the Account entity  
							
							
							
						 
						
							2019-10-04 00:53:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d3af9e19ed 
								
							 
						 
						
							
							
								
								Conversations: Load relations in one query.  
							
							
							
						 
						
							2019-08-14 17:01:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a49c92f6ae 
								
							 
						 
						
							
							
								
								Participation: Setting recipients will always add the owner.  
							
							
							
						 
						
							2019-08-06 14:51:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f88560accd 
								
							 
						 
						
							
							
								
								Conversations: Add recipient list to conversation participation.  
							
							... 
							
							
							
							This enables to address the same group of people every time. 
							
						 
						
							2019-08-02 11:55:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								970f71e222 
								
							 
						 
						
							
							
								
								Conversations: Fetch users in one query.  
							
							
							
						 
						
							2019-06-07 17:51:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a3a7178b60 
								
							 
						 
						
							
							
								
								Participations: Filter out participations without activities.  
							
							
							
						 
						
							2019-06-04 13:58:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8af55728e4 
								
							 
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2019-05-01 19:03:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cf353514fe 
								
							 
						 
						
							
							
								
								Participations: Add last activity.  
							
							
							
						 
						
							2019-04-10 17:28:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								20d9b90760 
								
							 
						 
						
							
							
								
								Participation: Get for a user.  
							
							
							
						 
						
							2019-04-10 17:05:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								280172f6f6 
								
							 
						 
						
							
							
								
								Conversations: Create or bump on inserting a dm.  
							
							
							
						 
						
							2019-04-10 16:33:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								64c1c3a407 
								
							 
						 
						
							
							
								
								Participations: Add marking as read and unread.  
							
							
							
						 
						
							2019-04-10 15:12:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d1da6b155a 
								
							 
						 
						
							
							
								
								Conversation: Add Conversations and Participations.  
							
							
							
						 
						
							2019-04-10 15:01:42 +02:00