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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								3fdbeb7087 
								
							 
						 
						
							
							
								
								MRF: add vocabulary policy module  
							
							
							
						 
						
							2019-08-13 20:55:38 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								af4cf35e20 
								
							 
						 
						
							
							
								
								Strip internal fields including likes from incoming and outgoing activities  
							
							
							
						 
						
							2019-08-10 18:47:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4f1b9c54b9 
								
							 
						 
						
							
							
								
								Do not rembed the object after updating it  
							
							
							
						 
						
							2019-08-07 01:02:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								73d8d5c49f 
								
							 
						 
						
							
							
								
								Stop depending on the embedded object in restrict_favorited_by  
							
							
							
						 
						
							2019-08-07 00:12:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								e8ad116c2a 
								
							 
						 
						
							
							
								
								Do not add the "next" key to likes.json if there is no more items  
							
							
							
						 
						
							2019-08-04 17:13:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								86fffe9c27 
								
							 
						 
						
							
							
								
								Merge branch 'patch-2' into 'develop'  
							
							... 
							
							
							
							Add preferredUsername to service actors so Mastodon can resolve them
See merge request pleroma/pleroma!1526  
							
						 
						
							2019-08-03 18:55:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1fce56c7df 
								
							 
						 
						
							
							
								
								Refactor  
							
							
							
						 
						
							2019-08-03 18:37:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								16cfb89240 
								
							 
						 
						
							
							
								
								Only add preferredUsername to service actor json when the underlying user actually has a username  
							
							
							
						 
						
							2019-08-03 18:28:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								8b2fa31fed 
								
							 
						 
						
							
							
								
								Handle MRF rejections of incoming AP activities  
							
							
							
						 
						
							2019-08-03 18:12:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a187dbb326 
								
							 
						 
						
							
							
								
								Add preferredUsername to service actors so Mastodon can resolve them  
							
							
							
						 
						
							2019-08-03 17:24:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c88a5d3251 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/hide-follows-remote  
							
							
							
						 
						
							2019-07-31 14:12:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								b93498eb52 
								
							 
						 
						
							
							
								
								constants: add as_public constant and use it everywhere  
							
							
							
						 
						
							2019-07-29 02:43:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								492d854e7a 
								
							 
						 
						
							
							
								
								transmogrifier: use User.delete() instead of handrolled user deletion code for remote users  
							
							... 
							
							
							
							Closes  #1104  
						
							2019-07-28 21:32:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								41e0304757 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/hide-follows-remote  
							
							
							
						 
						
							2019-07-25 18:43:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								f46805bb40 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-user-statuses  
							
							
							
						 
						
							2019-07-24 02:42:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								03471151d6 
								
							 
						 
						
							
							
								
								AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)  
							
							
							
						 
						
							2019-07-24 01:51:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								c49a09ed88 
								
							 
						 
						
							
							
								
								tests for Pleroma.Web.ActivityPub.Publisher  
							
							
							
						 
						
							2019-07-23 19:15:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								b70e659304 
								
							 
						 
						
							
							
								
								Feature/1087 wildcard option for blocks  
							
							
							
						 
						
							2019-07-22 14:33:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								56019d53a8 
								
							 
						 
						
							
							
								
								activitypub: publisher: align sharedinbox usage with AP specification rules  
							
							... 
							
							
							
							While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification.  Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification. 
							
						 
						
							2019-07-22 02:38:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								196cad46f3 
								
							 
						 
						
							
							
								
								Resolve merge conflicts  
							
							
							
						 
						
							2019-07-20 22:04:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								cf9cb953d5 
								
							 
						 
						
							
							
								
								activitypub: represent internal fetch actor  
							
							
							
						 
						
							2019-07-17 17:34:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								d930e5d5c3 
								
							 
						 
						
							
							
								
								activitypub: introduce internal fetch service actor  
							
							
							
						 
						
							2019-07-17 17:14:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								a9d6a12bb3 
								
							 
						 
						
							
							
								
								activitypub: controller: rework the way the relay actor is presented so the code can be reused  
							
							
							
						 
						
							2019-07-17 16:33:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								4885473be2 
								
							 
						 
						
							
							
								
								user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()  
							
							
							
						 
						
							2019-07-17 16:03:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									RX14 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								96a2890a9e 
								
							 
						 
						
							
							
								
								Add MRF MentionPolicy for dropping posts which mention specific actors  
							
							
							
						 
						
							2019-07-17 15:16:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								70439494af 
								
							 
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2019-07-16 14:56:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								c32384c1ea 
								
							 
						 
						
							
							
								
								tests for Pleroma.Signature  
							
							
							
						 
						
							2019-07-15 13:01:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								de13c9bb8f 
								
							 
						 
						
							
							
								
								List messages must be visible for mentioned users  
							
							
							
						 
						
							2019-07-15 14:54:40 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								d86a97abfb 
								
							 
						 
						
							
							
								
								Add an explanation comment to Publisher.publish/2  
							
							
							
						 
						
							2019-07-15 14:20:31 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								64a946643e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-07-15 14:11:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								739bbe0d3b 
								
							 
						 
						
							
							
								
								security: detect object containment violations at the IR level  
							
							... 
							
							
							
							It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers.  OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.
Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph. 
							
						 
						
							2019-07-14 17:47:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2dcb4c69 
								
							 
						 
						
							
							
								
								Add follow information refetching after following/unfollowing  
							
							
							
						 
						
							2019-07-14 01:58:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								183da33e00 
								
							 
						 
						
							
							
								
								Add tests for fetch_follow_information_for_user and check object type  
							
							... 
							
							
							
							when fetching the page 
							
						 
						
							2019-07-14 00:56:02 +03:00