rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								282f492cd5 
								
							 
						 
						
							
							
								
								Merge branch '1883-mrf-chat' into 'develop'  
							
							 
							
							... 
							
							
							
							HellthreadPolicy: Restrict to Notes and Articles.
Closes  #1883 
See merge request pleroma/pleroma!2666  
							
						 
						
							2020-06-22 10:00:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								93ae1c8bd3 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1854-emoji-pagination' into 'develop'  
							
							 
							
							... 
							
							
							
							Emoji and packs pagination
Closes  #1854 
See merge request pleroma/pleroma!2658  
							
						 
						
							2020-06-22 08:41:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								35e9282ffd 
								
							 
						 
						
							
							
								
								HellthreadPolicy: Restrict to Notes and Articles.  
							
							 
							
							
							
						 
						
							2020-06-22 10:35:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								b5f13af7ba 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex  
							
							 
							
							
							
						 
						
							2020-06-20 10:59:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								31761340fe 
								
							 
						 
						
							
							
								
								Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'  
							
							 
							
							... 
							
							
							
							Support 'bot' field in account update_credentials
Closes  #1600  and #1467 
See merge request pleroma/pleroma!2662  
							
						 
						
							2020-06-20 09:57:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0e789bc55f 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex  
							
							 
							
							
							
						 
						
							2020-06-20 09:39:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1a704e1f1e 
								
							 
						 
						
							
							
								
								fix for packs pagination  
							
							 
							
							
							
						 
						
							2020-06-20 10:56:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d4cfc9c5f 
								
							 
						 
						
							
							
								
								Stop filling conversation field on incoming objects (legacy, unused)  
							
							 
							
							... 
							
							
							
							conversation field is still set for outgoing federation for compatibility. 
							
						 
						
							2020-06-20 00:08:26 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								f928267773 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1855' into 'develop'  
							
							 
							
							... 
							
							
							
							#1855  MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648  
							
						 
						
							2020-06-19 20:38:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ac0344dd24 
								
							 
						 
						
							
							
								
								Only accounts with Service actor_type are considered as bots  
							
							 
							
							
							
						 
						
							2020-06-19 21:19:00 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b63646169d 
								
							 
						 
						
							
							
								
								Add support for bot field in update_credentials  
							
							 
							
							
							
						 
						
							2020-06-19 21:18:07 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cafdf18408 
								
							 
						 
						
							
							
								
								Merge branch '1873-pagination-fixes' into 'develop'  
							
							 
							
							... 
							
							
							
							[#1873 ] :offset pagination param support, hashtags pagination
Closes  #1873 
See merge request pleroma/pleroma!2659  
							
						 
						
							2020-06-19 13:42:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								372533b7c3 
								
							 
						 
						
							
							
								
								Merge branch 'dry-up-follower-update' into 'develop'  
							
							 
							
							... 
							
							
							
							User: update_follower_count refactor.
See merge request pleroma/pleroma!2649  
							
						 
						
							2020-06-19 13:40:34 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								5237a2df9f 
								
							 
						 
						
							
							
								
								[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.  
							
							 
							
							
							
						 
						
							2020-06-19 16:14:06 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								02ca8a363f 
								
							 
						 
						
							
							
								
								default page size for files  
							
							 
							
							
							
						 
						
							2020-06-19 14:46:38 +03: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4044f24e2e 
								
							 
						 
						
							
							
								
								fix test  
							
							 
							
							
							
						 
						
							2020-06-18 05:06:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2731ea1334 
								
							 
						 
						
							
							
								
								Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url  
							
							 
							
							
							
						 
						
							2020-06-17 13:13:55 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								c08c9db0c1 
								
							 
						 
						
							
							
								
								Remove misleading is_ prefix from boolean function  
							
							 
							
							
							
						 
						
							2020-06-17 13:02:01 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								71a5d9bffb 
								
							 
						 
						
							
							
								
								Empty list as default  
							
							 
							
							
							
						 
						
							2020-06-17 12:54:02 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3462d4b995 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1855  
							
							 
							
							
							
						 
						
							2020-06-17 12:50:06 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d772361e62 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1787-mogrify-args' into 'develop'  
							
							 
							
							... 
							
							
							
							Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652  
							
						 
						
							2020-06-17 15:53:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4b5a9730e 
								
							 
						 
						
							
							
								
								Remove poll from notification_type OpenAPI spec  
							
							 
							
							
							
						 
						
							2020-06-17 18:47:59 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								9a371bf5f6 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex  
							
							 
							
							
							
						 
						
							2020-06-17 13:12:38 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								44ce97a9c9 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex  
							
							 
							
							
							
						 
						
							2020-06-17 13:12:32 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								74fd761637 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex  
							
							 
							
							
							
						 
						
							2020-06-17 12:56:30 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4ec2fb967e 
								
							 
						 
						
							
							
								
								Merge branch 'features/users-raw_bio' into 'develop'  
							
							 
							
							... 
							
							
							
							User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326  
							
						 
						
							2020-06-17 10:34:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a77b0388f4 
								
							 
						 
						
							
							
								
								credo fix  
							
							 
							
							
							
						 
						
							2020-06-17 10:31:06 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5c0e1039ce 
								
							 
						 
						
							
							
								
								Chunk the notification type backfill migration  
							
							 
							
							... 
							
							
							
							Long-term we want that migration to be done entirely in SQL,
but for now this is a hotfix to not cause OOMs on large databases.
This is using a homegrown version of `Repo.stream`, it's worse in
terms of performance than the upstream since it doesn't use the same
prepared query for chunk queries, but unlike the upstream it supports
preloads. 
							
						 
						
							2020-06-16 23:53:13 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								b536e57124 
								
							 
						 
						
							
							
								
								Merge branch '1866-last-status-stuff' into 'develop'  
							
							 
							
							... 
							
							
							
							Resolve "/api/v1/conversations returns the wrong `last_status`"
Closes  #1866 
See merge request pleroma/pleroma!2647  
							
						 
						
							2020-06-16 18:10:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c2cee33ad 
								
							 
						 
						
							
							
								
								moving custom ecto types in context folders  
							
							 
							
							
							
						 
						
							2020-06-16 17:50:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								32c6576b60 
								
							 
						 
						
							
							
								
								naming  
							
							 
							
							
							
						 
						
							2020-06-16 15:54:22 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1603ac8fe 
								
							 
						 
						
							
							
								
								fix attemps to merge map  
							
							 
							
							
							
						 
						
							2020-06-16 15:54:22 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a4fde9766 
								
							 
						 
						
							
							
								
								Mogrify args as custom tuples  
							
							 
							
							
							
						 
						
							2020-06-16 15:53:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b023110799 
								
							 
						 
						
							
							
								
								fixed a visibility of functions  
							
							 
							
							
							
						 
						
							2020-06-15 20:48:22 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1ee8bc1da 
								
							 
						 
						
							
							
								
								User: update_follower_count refactor.  
							
							 
							
							
							
						 
						
							2020-06-15 14:29:34 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								579763126f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1855  
							
							 
							
							
							
						 
						
							2020-06-15 15:24:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								58e4e3db8b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers  
							
							 
							
							
							
						 
						
							2020-06-15 16:03:40 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								62b8c31b7a 
								
							 
						 
						
							
							
								
								added tests  
							
							 
							
							
							
						 
						
							2020-06-15 14:55:00 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b7df7436c8 
								
							 
						 
						
							
							
								
								Conversations: Return last dm for conversation, not last message.  
							
							 
							
							
							
						 
						
							2020-06-15 12:27:13 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2e8a236cef 
								
							 
						 
						
							
							
								
								fix invalidates media url's  
							
							 
							
							
							
						 
						
							2020-06-14 21:02:57 +03: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								271ea5068f 
								
							 
						 
						
							
							
								
								Merge branch '1851-favorites-pagination' into 'develop'  
							
							 
							
							... 
							
							
							
							StatusController: Correctly paginate favorites.
Closes  #1851 
See merge request pleroma/pleroma!2636  
							
						 
						
							2020-06-13 17:20:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1d625c29a0 
								
							 
						 
						
							
							
								
								ControllerHelper: Always return id field.  
							
							 
							
							
							
						 
						
							2020-06-13 13:12:43 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4b865bba10 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/controller_helper.ex  
							
							 
							
							
							
						 
						
							2020-06-13 10:37:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								cb7be6eef2 
								
							 
						 
						
							
							
								
								Remove use of atoms in MRF.UserAllowListPolicy  
							
							 
							
							
							
						 
						
							2020-06-13 12:08:46 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								520367d6fd 
								
							 
						 
						
							
							
								
								Fix atom leak in Rich Media Parser  
							
							 
							
							
							
						 
						
							2020-06-13 12:08:46 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								4115701f71 
								
							 
						 
						
							
							
								
								Merge branch 'recipients-experiments' into 'develop'  
							
							 
							
							... 
							
							
							
							ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637  
							
						 
						
							2020-06-12 16:57:13 +00:00