sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								2d7da5f437 
								
							 
						 
						
							
							
								
								Don't crash on AP request for tombstone  
							
							 
							
							... 
							
							
							
							Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api 
							
						 
						
							2019-01-05 11:16:05 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								096a927805 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into pool-usage  
							
							 
							
							
							
						 
						
							2019-01-01 14:19:55 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d4799e0dc2 
								
							 
						 
						
							
							
								
								Remove default pool, it's used automatically anyway.  
							
							 
							
							
							
						 
						
							2019-01-01 13:49:24 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								980b5288ed 
								
							 
						 
						
							
							
								
								update copyright years to 2019  
							
							 
							
							
							
						 
						
							2018-12-31 15:41:47 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								3dc5f04976 
								
							 
						 
						
							
							
								
								Merge branch 'carrot-bullying' into 'develop'  
							
							 
							
							... 
							
							
							
							Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595  
							
						 
						
							2018-12-29 11:46:06 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Vyr Cossont 
								
							 
						 
						
							
							
							
							
								
							
							
								e4562105e7 
								
							 
						 
						
							
							
								
								Implement exclude_reblogs and include_rts  
							
							 
							
							
							
						 
						
							2018-12-26 21:38:00 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5811e65e67 
								
							 
						 
						
							
							
								
								Add some hard limits on inserted activities.  
							
							 
							
							
							
						 
						
							2018-12-26 12:39:35 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							 
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								074fa790ba 
								
							 
						 
						
							
							
								
								fix compile warnings  
							
							 
							
							
							
						 
						
							2018-12-09 20:50:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								abead01ab6 
								
							 
						 
						
							
							
								
								Merge branch 'correct-and-improve-http-options' into 'develop'  
							
							 
							
							... 
							
							
							
							Correct and improve http options
See merge request pleroma/pleroma!505  
							
						 
						
							2018-12-06 15:57:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								a09ed0f5af 
								
							 
						 
						
							
							
								
								avoid mix format bug  
							
							 
							
							
							
						 
						
							2018-12-06 18:41:29 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ccf0b46dd6 
								
							 
						 
						
							
							
								
								Merge branch '210_twitter_api_uploads_alt_text' into 'develop'  
							
							 
							
							... 
							
							
							
							[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496  
							
						 
						
							2018-12-06 07:36:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3e90f688f1 
								
							 
						 
						
							
							
								
								[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.  
							
							 
							
							... 
							
							
							
							Refactoring. 
							
						 
						
							2018-12-06 10:26:17 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								96ba95df2e 
								
							 
						 
						
							
							
								
								remove follow_redirect options  
							
							 
							
							
							
						 
						
							2018-12-06 11:38:33 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								27792b2d77 
								
							 
						 
						
							
							
								
								remove pool and timeout options which duplicate with the default  
							
							 
							
							
							
						 
						
							2018-12-06 11:23:15 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3b5be09f45 
								
							 
						 
						
							
							
								
								[ #210 ] Stylistic change.  
							
							 
							
							
							
						 
						
							2018-12-05 21:48:21 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c4f3c5e939 
								
							 
						 
						
							
							
								
								[ #210 ] Stylistic change.  
							
							 
							
							
							
						 
						
							2018-12-05 20:23:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								848151f7cb 
								
							 
						 
						
							
							
								
								[ #210 ] [TwitterAPI] Made actor be stored for uploads. Added ownership check  
							
							 
							
							... 
							
							
							
							to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring. 
							
						 
						
							2018-12-05 13:37:06 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								87109482f3 
								
							 
						 
						
							
							
								
								status_code -> status  
							
							 
							
							
							
						 
						
							2018-12-04 14:04:06 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c443c9bd72 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info  
							
							 
							
							
							
						 
						
							2018-12-01 09:55:46 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b19597f602 
								
							 
						 
						
							
							
								
								reverse proxy / uploads  
							
							 
							
							
							
						 
						
							2018-11-30 18:00:47 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0896cf4c0f 
								
							 
						 
						
							
							
								
								Fix most mastodon api bugs.  
							
							 
							
							
							
						 
						
							2018-11-20 20:12:39 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4c918392c6 
								
							 
						 
						
							
							
								
								Fix most User tests.  
							
							 
							
							
							
						 
						
							2018-11-18 21:40:52 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c88533209c 
								
							 
						 
						
							
							
								
								activitypub: user fetching: use fetch_and_contain_remote_object_from_id()  
							
							 
							
							
							
						 
						
							2018-11-17 20:16:03 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								daa8ec3d62 
								
							 
						 
						
							
							
								
								activitypub: factor out AP object fetching to it's own function and add ID-based containment  
							
							 
							
							
							
						 
						
							2018-11-17 20:15:59 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								603fccf175 
								
							 
						 
						
							
							
								
								activitypub: fetch_object_from_id(): prefer actor over attributedTo to avoid spoofing  
							
							 
							
							
							
						 
						
							2018-11-17 18:17:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5bb88fd174 
								
							 
						 
						
							
							
								
								Runtime configuration  
							
							 
							
							... 
							
							
							
							Related to #85 
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro. 
							
						 
						
							2018-11-06 19:41:15 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								10f3958468 
								
							 
						 
						
							
							
								
								object: return the deleted object as well  
							
							 
							
							
							
						 
						
							2018-11-01 07:47:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2bf358d7b4 
								
							 
						 
						
							
							
								
								activitypub: use Object.delete() instead of mutating the database and cache directly  
							
							 
							
							
							
						 
						
							2018-11-01 07:29:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								b92e38d2d4 
								
							 
						 
						
							
							
								
								Add user reactivation task.  
							
							 
							
							
							
						 
						
							2018-10-29 23:13:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								167d3789a5 
								
							 
						 
						
							
							
								
								activitypub: upload: pass through an upload limit if one is provided  
							
							 
							
							
							
						 
						
							2018-10-29 16:43:05 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								72ea54de6e 
								
							 
						 
						
							
							
								
								activitypub: fix possible false positives with broken thread filtering  
							
							 
							
							
							
						 
						
							2018-10-28 05:45:33 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								26eb11c172 
								
							 
						 
						
							
							
								
								activitypub: add support for filtering broken threads out of timelines  
							
							 
							
							
							
						 
						
							2018-10-26 06:16:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4db1bc2c0e 
								
							 
						 
						
							
							
								
								activitypub: fix error condition match  
							
							 
							
							
							
						 
						
							2018-09-30 05:26:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								707077edde 
								
							 
						 
						
							
							
								
								activitypub: don't fall back to OStatus fetching when MRF rejects an object  
							
							 
							
							
							
						 
						
							2018-09-28 00:45:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								523757be52 
								
							 
						 
						
							
							
								
								[Pleroma.Web.ActivityPub.ActivityPub]: Harden getting endpoints [kroeg]  
							
							 
							
							
							
						 
						
							2018-09-27 20:00:45 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1c9e539b47 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mastodon_api_2.4.x' into 'develop'  
							
							 
							
							... 
							
							
							
							Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266  
							
						 
						
							2018-09-03 12:33:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0b2c051a04 
								
							 
						 
						
							
							
								
								activitypub: fix possibility of spoofing by containing remote objects to the same domain as their actor  
							
							 
							
							
							
						 
						
							2018-09-01 23:20:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								29b5e30c46 
								
							 
						 
						
							
							
								
								activity: drop recipients_to/recipients_cc fields  
							
							 
							
							
							
						 
						
							2018-08-29 18:41:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								de9acebbf3 
								
							 
						 
						
							
							
								
								activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.  
							
							 
							
							
							
						 
						
							2018-08-29 18:41:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								643fae6e36 
								
							 
						 
						
							
							
								
								activitypub: allow querying the activity/object graph bounded to a specific to/cc set  
							
							 
							
							
							
						 
						
							2018-08-29 08:51:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								81673b8136 
								
							 
						 
						
							
							
								
								activity: add recipients_to and recipients_cc fields  
							
							 
							
							
							
						 
						
							2018-08-29 08:42:33 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								97e20d2932 
								
							 
						 
						
							
							
								
								[MastodonAPI] the tag field isn’t fixed to a static type in pleroma  
							
							 
							
							
							
						 
						
							2018-08-27 15:08:25 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								83efaa3af6 
								
							 
						 
						
							
							
								
								[MastodonAPI] Add streaming of hashtags  
							
							 
							
							
							
						 
						
							2018-08-27 15:08:25 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								46c7c2380c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/relay' into 'develop'  
							
							 
							
							... 
							
							
							
							message relay
Closes  #144 
See merge request pleroma/pleroma!264  
							
						 
						
							2018-08-27 08:29:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								440b459cd1 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/announce-timeline-flooding' into 'develop'  
							
							 
							
							... 
							
							
							
							activitypub: filter destination list for announce activities differently than normal (closes  #164 )
Closes  #164 
See merge request pleroma/pleroma!227  
							
						 
						
							2018-08-27 08:25:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0f5bff8c66 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/relay'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex 
							
						 
						
							2018-08-26 21:06:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								51a21284c6 
								
							 
						 
						
							
							
								
								ActivityPub: follow redirects when fetching user  
							
							 
							
							
							
						 
						
							2018-08-20 15:03:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0ca9b9ff96 
								
							 
						 
						
							
							
								
								run mix format  
							
							 
							
							
							
						 
						
							2018-08-06 08:26:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1c90f88393 
								
							 
						 
						
							
							
								
								user: remote actors can have no nickname if they are virtual services  
							
							 
							
							
							
						 
						
							2018-08-06 08:22:11 +00:00