Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dbbc801667 
								
							 
						 
						
							
							
								
								pagination for remote emoji packs  
							
							
							
						 
						
							2020-09-24 09:12:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								436d1a3c41 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'issue/2115'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2020-09-23 11:49:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								72d2b34d3b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1975  
							
							
							
						 
						
							2020-09-22 21:42:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c95859e45b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115  
							
							
							
						 
						
							2020-09-22 17:13:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2ec0dcf001 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/2099  
							
							
							
						 
						
							2020-09-18 07:08:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								7bf269fe83 
								
							 
						 
						
							
							
								
								Fix MRF reject for ChatMessage  
							
							
							
						 
						
							2020-09-17 22:07:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c41430b23e 
								
							 
						 
						
							
							
								
								Refactor with Chat.for_user_query/1  
							
							
							
						 
						
							2020-09-11 14:10:13 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f88dc1937e 
								
							 
						 
						
							
							
								
								MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1  
							
							
							
						 
						
							2020-09-11 14:09:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9853c90abb 
								
							 
						 
						
							
							
								
								added paginate links to headers for  /chats/:id/messages  
							
							
							
						 
						
							2020-09-10 12:39:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								917d325972 
								
							 
						 
						
							
							
								
								added api spec  
							
							
							
						 
						
							2020-09-07 07:17:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5ae56aafb2 
								
							 
						 
						
							
							
								
								added import mutes  
							
							
							
						 
						
							2020-09-06 21:42:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0b621a834a 
								
							 
						 
						
							
							
								
								Chats: Add cascading delete on both referenced users.  
							
							... 
							
							
							
							Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases. 
							
						 
						
							2020-08-31 16:48:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								78939c1d16 
								
							 
						 
						
							
							
								
								ChatController: Don't die if the recipient is gone.  
							
							
							
						 
						
							2020-08-27 12:13:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0922791e4d 
								
							 
						 
						
							
							
								
								updated errors on add emoji  
							
							
							
						 
						
							2020-08-22 10:56:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f5845ff033 
								
							 
						 
						
							
							
								
								upload emoji zip file  
							
							
							
						 
						
							2020-08-22 10:42:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								7794d7c694 
								
							 
						 
						
							
							
								
								added Pleroma.Web.PleromaAPI.EmojiFileController  
							
							
							
						 
						
							2020-08-19 06:50:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								781b270863 
								
							 
						 
						
							
							
								
								ChatMessageReferenceView: Display preview cards.  
							
							
							
						 
						
							2020-07-30 19:57:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3b7c454418 
								
							 
						 
						
							
							
								
								Let favourites and emoji reactions optionally be hidden  
							
							
							
						 
						
							2020-07-28 14:58:30 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9ea51a6de5 
								
							 
						 
						
							
							
								
								[ #2791 ] AccountView: renamed :force option to :skip_visibility_check.  
							
							
							
						 
						
							2020-07-23 15:08:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6f5f7af607 
								
							 
						 
						
							
							
								
								[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.  
							
							... 
							
							
							
							Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting. 
							
						 
						
							2020-07-22 19:06:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								341a8f3500 
								
							 
						 
						
							
							
								
								Skip the correct plug  
							
							
							
						 
						
							2020-07-21 17:26:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KokaKiwi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7ce722ce3e 
								
							 
						 
						
							
							
								
								Fix /api/pleroma/emoji/packs index endpoint.  
							
							
							
						 
						
							2020-07-18 12:55:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c8dd973af5 
								
							 
						 
						
							
							
								
								AccountController: Remove unused update_? routes.  
							
							... 
							
							
							
							These were not documented and are also not used anymore. 
							
						 
						
							2020-07-07 16:53:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3e3f9253e6 
								
							 
						 
						
							
							
								
								adding overall count for packs and files  
							
							
							
						 
						
							2020-06-19 10:17:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4975ed86bc 
								
							 
						 
						
							
							
								
								emoji pagination for pack show action  
							
							
							
						 
						
							2020-06-18 18:50:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3becdafd33 
								
							 
						 
						
							
							
								
								emoji packs pagination  
							
							
							
						 
						
							2020-06-18 14:32:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3b5282bef2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-08 11:19:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								89b85f6529 
								
							 
						 
						
							
							
								
								ChatController: Remove nonsensical pagination.  
							
							
							
						 
						
							2020-06-08 11:09:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fe2a5d0614 
								
							 
						 
						
							
							
								
								ChatController: Make last_read_id mandatory.  
							
							
							
						 
						
							2020-06-07 20:22:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								801e668a97 
								
							 
						 
						
							
							
								
								ChatController: Add last_read_id option to mark_as_read.  
							
							
							
						 
						
							2020-06-07 15:38:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2cdaac4330 
								
							 
						 
						
							
							
								
								SideEffects: Move streaming of chats to after the transaction.  
							
							
							
						 
						
							2020-06-07 14:52:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f4cf4ae16e 
								
							 
						 
						
							
							
								
								ChatController: Use new oauth scope *:chats.  
							
							
							
						 
						
							2020-06-06 16:48:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ca0e6e702b 
								
							 
						 
						
							
							
								
								ChatMessageReference -> Chat.MessageReference  
							
							
							
						 
						
							2020-06-06 11:51:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cc8a7dc205 
								
							 
						 
						
							
							
								
								SideEffects / ChatView: Add an unread cache.  
							
							... 
							
							
							
							This is to prevent wrong values in the stream. 
							
						 
						
							2020-06-05 12:01:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								317e2b8d61 
								
							 
						 
						
							
							
								
								Use atoms as keys in ActivityPub.fetch_* functions options  
							
							
							
						 
						
							2020-06-04 21:36:26 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								00748e9650 
								
							 
						 
						
							
							
								
								ChatMessageReferences: Change seen -> unread  
							
							
							
						 
						
							2020-06-04 17:14:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b3407344d3 
								
							 
						 
						
							
							
								
								ChatController: Add function to mark single message as read.  
							
							
							
						 
						
							2020-06-03 19:21:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c020fd4352 
								
							 
						 
						
							
							
								
								ChatMessageReferenceView: Return read status as unread.  
							
							
							
						 
						
							2020-06-03 18:58:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7f5c5b11a5 
								
							 
						 
						
							
							
								
								Chats: Remove unread from the db, calculate from unseen messages.  
							
							
							
						 
						
							2020-06-03 14:26:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								73127cff75 
								
							 
						 
						
							
							
								
								Credo fixes.  
							
							
							
						 
						
							2020-06-03 13:17:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f3ccd50a33 
								
							 
						 
						
							
							
								
								ChatMessageReferences: Adjust views  
							
							
							
						 
						
							2020-06-03 12:49:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aa22fce8f4 
								
							 
						 
						
							
							
								
								ChatMessageReference: Introduce and switch in chat controller.  
							
							
							
						 
						
							2020-06-03 12:30:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								767ce8b803 
								
							 
						 
						
							
							
								
								StreamerView: Actually send Chats, not ChatMessages.  
							
							
							
						 
						
							2020-05-29 16:02:45 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								95f6240889 
								
							 
						 
						
							
							
								
								Fix minor spelling error  
							
							
							
						 
						
							2020-05-27 14:34:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ee35bb5ac2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-25 13:57:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1fa7aa9fc5 
								
							 
						 
						
							
							
								
								Merge branch 'emoji-react-better-errors' into 'develop'  
							
							... 
							
							
							
							EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569  
							
						 
						
							2020-05-22 14:36:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ba106aa9c8 
								
							 
						 
						
							
							
								
								Fix notifications mark as read API  
							
							
							
						 
						
							2020-05-22 18:15:36 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bcb549531f 
								
							 
						 
						
							
							
								
								EmojiReactionController: Return more appropriate error.  
							
							
							
						 
						
							2020-05-22 14:38:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								578ed3a37f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-21 15:35:13 +02:00