lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ef43016b2c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/custom-fields' into 'develop'  
							
							 
							
							... 
							
							
							
							Add custom profile fields
See merge request pleroma/pleroma!1488  
							
						 
						
							2019-08-20 12:44:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								18c8c8d176 
								
							 
						 
						
							
							
								
								Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'  
							
							 
							
							... 
							
							
							
							Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575  
							
						 
						
							2019-08-18 21:57:55 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7ab2dbbdb6 
								
							 
						 
						
							
							
								
								Merge branch 'pleroma-conversations' into 'develop'  
							
							 
							
							... 
							
							
							
							Extended Pleroma Conversations
See merge request pleroma/pleroma!1535  
							
						 
						
							2019-08-16 12:55:33 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1ad71592ad 
								
							 
						 
						
							
							
								
								Parallelize template rendering  
							
							 
							
							
							
						 
						
							2019-08-15 18:05:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a4a3e3becd 
								
							 
						 
						
							
							
								
								Hide muted theads from home/public timelines unless with_muted is set  
							
							 
							
							
							
						 
						
							2019-08-15 17:37:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								bd5ad0af78 
								
							 
						 
						
							
							
								
								Cache follow state  
							
							 
							
							
							
						 
						
							2019-08-15 00:47:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								31d576de0c 
								
							 
						 
						
							
							
								
								Merge branch 'misc-otp-issues' into 'develop'  
							
							 
							
							... 
							
							
							
							Misc OTP issues
See merge request pleroma/pleroma!1567  
							
						 
						
							2019-08-14 19:22:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dc902ad3df 
								
							 
						 
						
							
							
								
								Merge branch 'fix/http-signatures-post' into 'develop'  
							
							 
							
							... 
							
							
							
							activitypub: publisher: add (request-target) to http signature when POSTing
See merge request pleroma/pleroma!1569  
							
						 
						
							2019-08-14 19:16:52 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1754f8ce6d 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex  
							
							 
							
							
							
						 
						
							2019-08-14 19:05:44 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								5bb418a90d 
								
							 
						 
						
							
							
								
								activitypub: publisher: add (request-target) to http signature when POSTing  
							
							 
							
							
							
						 
						
							2019-08-14 19:01:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								626e094589 
								
							 
						 
						
							
							
								
								MRF: fix up unserializable option lists in describe implementations  
							
							 
							
							
							
						 
						
							2019-08-14 18:54:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									stwf 
								
							 
						 
						
							
							
							
							
								
							
							
								574856ef01 
								
							 
						 
						
							
							
								
								streamline Streamer pings  
							
							 
							
							
							
						 
						
							2019-08-14 11:58:32 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									stwf 
								
							 
						 
						
							
							
							
							
								
							
							
								15ef521009 
								
							 
						 
						
							
							
								
								Isolate OAuth.Token.CleanWorker  
							
							 
							
							
							
						 
						
							2019-08-14 11:57:50 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									stwf 
								
							 
						 
						
							
							
							
							
								
							
							
								51bdf0cab6 
								
							 
						 
						
							
							
								
								use default child_specs  
							
							 
							
							
							
						 
						
							2019-08-14 11:55:17 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d3af9e19ed 
								
							 
						 
						
							
							
								
								Conversations: Load relations in one query.  
							
							 
							
							
							
						 
						
							2019-08-14 17:01:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f73212b2a3 
								
							 
						 
						
							
							
								
								Conversation: Render new participation on update.  
							
							 
							
							
							
						 
						
							2019-08-14 15:56:15 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								df81abb68c 
								
							 
						 
						
							
							
								
								Conversations: Use correct oauth paths for extended api.  
							
							 
							
							
							
						 
						
							2019-08-14 15:55:43 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								560dbad538 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into pleroma-conversations  
							
							 
							
							
							
						 
						
							2019-08-14 15:30:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e457fcc479 
								
							 
						 
						
							
							
								
								Add :max_remote_account_fields config option  
							
							 
							
							
							
						 
						
							2019-08-14 14:58:06 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								f7bbf99caa 
								
							 
						 
						
							
							
								
								Use info.fields instead of source_data for remote users  
							
							 
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								7d6f8a7fd7 
								
							 
						 
						
							
							
								
								Linkify custom fields values in ActivityPub.UserViewx  
							
							 
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5178f960c3 
								
							 
						 
						
							
							
								
								Support user attachment update in Transmogrifier  
							
							 
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								88598c9baf 
								
							 
						 
						
							
							
								
								Add profile custom fields to ActivityPub.UserView  
							
							 
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a22f540fc4 
								
							 
						 
						
							
							
								
								Add custom fields to TwitterAPI.UserView  
							
							 
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e0ac5c7a66 
								
							 
						 
						
							
							
								
								Add custom profile fields  
							
							 
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								5c35d2f1d8 
								
							 
						 
						
							
							
								
								Merge branch 'preload-user-timelines' into 'develop'  
							
							 
							
							... 
							
							
							
							Preload thread mutes/bookmarks in user_statuses
See merge request pleroma/pleroma!1563  
							
						 
						
							2019-08-14 01:04:07 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								fe42844bda 
								
							 
						 
						
							
							
								
								Merge branch 'get-context-optimizations' into 'develop'  
							
							 
							
							... 
							
							
							
							Preload thread mutes/bookmarks in get_context
See merge request pleroma/pleroma!1562  
							
						 
						
							2019-08-14 01:03:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								8202f1634a 
								
							 
						 
						
							
							
								
								Preload thread mutes/bookmarks in user_statuses  
							
							 
							
							
							
						 
						
							2019-08-14 03:02:09 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f4e087ee48 
								
							 
						 
						
							
							
								
								Preload thread mutes/bookmarks in get_context  
							
							 
							
							... 
							
							
							
							Also removes filtering for creates (was done on the database side
already) and filtering for the requested activity (moved to the database
side) from application side. 
							
						 
						
							2019-08-14 02:36:54 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9ef31767f2 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mrf-vocabulary' into 'develop'  
							
							 
							
							... 
							
							
							
							MRF Vocabulary
See merge request pleroma/pleroma!1559  
							
						 
						
							2019-08-13 22:51:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c3a54cc34d 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mrf-describe' into 'develop'  
							
							 
							
							... 
							
							
							
							MRF describe API
See merge request pleroma/pleroma!1561  
							
						 
						
							2019-08-13 22:46:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								abfbcfdcb3 
								
							 
						 
						
							
							
								
								mrf_vocabulary: add describe API support  
							
							 
							
							
							
						 
						
							2019-08-13 22:39:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								4244e17de0 
								
							 
						 
						
							
							
								
								fix credo  
							
							 
							
							
							
						 
						
							2019-08-13 22:36:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								47c20ab796 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'  
							
							 
							
							... 
							
							
							
							Mastodon API: Preloading and normalization optimizations
See merge request pleroma/pleroma!1558  
							
						 
						
							2019-08-13 22:32:49 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								46d7bef7e7 
								
							 
						 
						
							
							
								
								Nicer formatting for safe_render errors  
							
							 
							
							
							
						 
						
							2019-08-14 01:15:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								f305e97eeb 
								
							 
						 
						
							
							
								
								nodeinfo: use MRF.describe() instead of hardcoded MRF transparency stuff  
							
							 
							
							
							
						 
						
							2019-08-13 22:09:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								c574b7a1fc 
								
							 
						 
						
							
							
								
								MRF: add describe() to all modules, add base MRF configuration to base describe()  
							
							 
							
							
							
						 
						
							2019-08-13 22:08:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								694bc43123 
								
							 
						 
						
							
							
								
								MRF: add describe() for gathering and describing the MRF configuration  
							
							 
							
							
							
						 
						
							2019-08-13 21:26:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								fea4d89e9f 
								
							 
						 
						
							
							
								
								tests for Web/ActivityPub/Relay  
							
							 
							
							
							
						 
						
							2019-08-13 21:12:59 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								04da1166db 
								
							 
						 
						
							
							
								
								tests for /web/mastodon_api/mastodon_api.ex  
							
							 
							
							
							
						 
						
							2019-08-13 21:12:37 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								3fdbeb7087 
								
							 
						 
						
							
							
								
								MRF: add vocabulary policy module  
							
							 
							
							
							
						 
						
							2019-08-13 20:55:38 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c1b6952d2a 
								
							 
						 
						
							
							
								
								Mastodon API: Preloading and normalization optimizations  
							
							 
							
							... 
							
							
							
							- Try to normalize the activity instead of object wherever possible
- Put the `user` key on non-home timelines as well so bookmarks and
thread mutes are preloaded there as well
- Skip trying to get the user when rendering mentions if the id ==
as:Public or user's follower collection
- Preload the object when getting replied to activities and do not crash
if it's not present
This almost solves the problem of Pleroma hammering the db with a lot
of queries when rendering timelines, the things left are
1. When rendering mentions and the user is not in cache, save it for
later and request all uncached users in one go
2. Somehow get rid of needing to get the latest follow activity to
detect the value of `requested` in a relationship. (create a database
view for user relationship and cache it maybe?) 
							
						 
						
							2019-08-13 20:34:34 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								f46cd7e9c7 
								
							 
						 
						
							
							
								
								config: remove legacy activitypub accept_blocks setting  
							
							 
							
							... 
							
							
							
							Anyone who is interested in dropping blocks can write their own MRF
policy at this point.  This setting predated the MRF framework.
Disabling the side effect (unsubscription) is still a config option
per policy. 
							
						 
						
							2019-08-13 02:15:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								511ccea5aa 
								
							 
						 
						
							
							
								
								ConversationView: Align parameter names with other views.  
							
							 
							
							
							
						 
						
							2019-08-12 14:23:06 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								60231ec7bd 
								
							 
						 
						
							
							
								
								Conversation: Add endpoint to get a conversation by id.  
							
							 
							
							
							
						 
						
							2019-08-12 13:58:04 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								23c46f7e72 
								
							 
						 
						
							
							
								
								Conversations: Use 'recipients' for accounts in conversation view.  
							
							 
							
							... 
							
							
							
							According to gargron, this is the intended usage. 
							
						 
						
							2019-08-12 12:51:08 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								92479c6f48 
								
							 
						 
						
							
							
								
								Do not fetch the reply object in fix_type unless the object has the  
							
							 
							
							... 
							
							
							
							`name` key and use a depth limit when fetching it 
							
						 
						
							2019-08-11 22:49:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								9cfc289594 
								
							 
						 
						
							
							
								
								MRF: ensure that subdomain_match calls are case-insensitive  
							
							 
							
							
							
						 
						
							2019-08-10 21:19:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								84808e1697 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/hide-follows-counters'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2019-08-10 18:49:04 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								af4cf35e20 
								
							 
						 
						
							
							
								
								Strip internal fields including likes from incoming and outgoing activities  
							
							 
							
							
							
						 
						
							2019-08-10 18:47:40 +00:00