Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f13d6c7f78 
								
							 
						 
						
							
							
								
								update api to set skip_thread_containment  
							
							 
							
							
							
						 
						
							2019-06-03 21:02:57 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								080e1aa70e 
								
							 
						 
						
							
							
								
								add option skip_thread_containment  
							
							 
							
							
							
						 
						
							2019-06-03 16:13:37 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e706b42f51 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'  
							
							 
							
							... 
							
							
							
							visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
See merge request pleroma/pleroma!1230  
							
						 
						
							2019-06-01 03:39:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								2bbc2a801f 
								
							 
						 
						
							
							
								
								Remove all follower collections but actor's from "cc"  
							
							 
							
							
							
						 
						
							2019-06-01 03:26:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f2efe24cf8 
								
							 
						 
						
							
							
								
								visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility  
							
							 
							
							
							
						 
						
							2019-06-01 03:24:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5d3ece2861 
								
							 
						 
						
							
							
								
								Remove now useless flavours switching  
							
							 
							
							
							
						 
						
							2019-06-01 01:44:10 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aa9f52edd2 
								
							 
						 
						
							
							
								
								mastodon_api_controller.ex: Remove vanilla from supported_flavours  
							
							 
							
							
							
						 
						
							2019-06-01 01:44:10 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								6872c5f88f 
								
							 
						 
						
							
							
								
								Mastodon API search default value for "resolve" is false  
							
							 
							
							... 
							
							
							
							https://docs.joinmastodon.org/api/rest/accounts/ 
https://docs.joinmastodon.org/api/rest/search/  
							
						 
						
							2019-05-31 18:46:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								2993361075 
								
							 
						 
						
							
							
								
								Merge branch 'hotfix/leaking-lists' into 'develop'  
							
							 
							
							... 
							
							
							
							Mastodon API: Fix lists leaking private posts
See merge request pleroma/pleroma!1222  
							
						 
						
							2019-05-31 13:26:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d9c0650ff9 
								
							 
						 
						
							
							
								
								Mastodon API: Fix lists leaking private posts  
							
							 
							
							... 
							
							
							
							Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).
Reported by @kurisu@iscute.moe via a DM 
							
						 
						
							2019-05-31 15:25:17 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a9eaa55885 
								
							 
						 
						
							
							
								
								Fix fix_explicit_addressing moving follower collection to cc and add tests for it  
							
							 
							
							
							
						 
						
							2019-05-31 14:17:05 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								1690be991e 
								
							 
						 
						
							
							
								
								Replace missing non-nullable Card attributes with empty strings  
							
							 
							
							
							
						 
						
							2019-05-30 21:03:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								91ac8b075b 
								
							 
						 
						
							
							
								
								Merge branch 'use-pleroma-config' into 'develop'  
							
							 
							
							... 
							
							
							
							Use Pleroma.Config everywhere
See merge request pleroma/pleroma!1214  
							
						 
						
							2019-05-30 13:16:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								99f70c7e20 
								
							 
						 
						
							
							
								
								Use Pleroma.Config everywhere  
							
							 
							
							
							
						 
						
							2019-05-30 15:33:58 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								6aec0d1b58 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !1209  
							
						 
						
							2019-05-29 22:10:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								672fddb721 
								
							 
						 
						
							
							
								
								Default search limit should be 40  
							
							 
							
							... 
							
							
							
							https://docs.joinmastodon.org/api/rest/search/  
							
						 
						
							2019-05-29 08:06:26 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0159a6dbe9 
								
							 
						 
						
							
							
								
								router: require oauth_read for searching  
							
							 
							
							... 
							
							
							
							Search calls are generally expensive and allow unauthenticated users to
crawl the instance for user profiles or posts which contain specified
keywords.  An adversary can build a distributed search engine which not
only will consume significant instance resources, but also can be used
for undesirable purposes such as datamining.
Accordingly, require authenticated access to use the search API endpoints.
This acts as a nice balance as it allows guest users to make use of most
functionality available in Pleroma FE while ensuring that Pleroma
instances are reasonably protected from resource exhaustion.  It also
removes Pleroma as a potential vector in distributed search engines. 
							
						 
						
							2019-05-29 10:58:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									jeff 
								
							 
						 
						
							
							
							
							
								
							
							
								9f3bcf0efe 
								
							 
						 
						
							
							
								
								Respect proxy settings federation  
							
							 
							
							
							
						 
						
							2019-05-28 06:49:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								5bb843ceec 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/die-httpoison-die' into 'develop'  
							
							 
							
							... 
							
							
							
							remove @httpoison, @ostatus and @websub compile-time constants
See merge request pleroma/pleroma!1203  
							
						 
						
							2019-05-26 13:33:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								79503ce90f 
								
							 
						 
						
							
							
								
								mrf: simple policy: fix matching imported activitypub and ostatus statuses  
							
							 
							
							
							
						 
						
							2019-05-26 02:01:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								56fd7dbdd7 
								
							 
						 
						
							
							
								
								remove @websub and @ostatus module-level constants  
							
							 
							
							
							
						 
						
							2019-05-25 04:43:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9bec891eb4 
								
							 
						 
						
							
							
								
								kill @httpoison  
							
							 
							
							
							
						 
						
							2019-05-25 04:24:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								9415932af5 
								
							 
						 
						
							
							
								
								Keep nodeinfo available when not federating  
							
							 
							
							
							
						 
						
							2019-05-25 08:15:12 +08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								bbea5691da 
								
							 
						 
						
							
							
								
								Mention all people in the beginning of DM  
							
							 
							
							
							
						 
						
							2019-05-24 20:34:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								f916e4cdd9 
								
							 
						 
						
							
							
								
								Move the Cache Control header test to its own file  
							
							 
							
							... 
							
							
							
							We can consolidate our cache control header tests here 
							
						 
						
							2019-05-24 20:33:55 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								baf72d6c58 
								
							 
						 
						
							
							
								
								mrf: simple policy: add the ability to strip avatars and banners from user profiles  
							
							 
							
							
							
						 
						
							2019-05-22 18:53:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								60f882b09f 
								
							 
						 
						
							
							
								
								activitypub: run user objects through MRF filters  
							
							 
							
							
							
						 
						
							2019-05-22 18:53:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								75b6c4b004 
								
							 
						 
						
							
							
								
								mrf: defang policy modules for filtering user profile objects  
							
							 
							
							
							
						 
						
							2019-05-22 18:53:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								54e10a3e55 
								
							 
						 
						
							
							
								
								Disable timeouts for object pruning query  
							
							 
							
							
							
						 
						
							2019-05-22 20:10:52 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								620908a2db 
								
							 
						 
						
							
							
								
								[ #699 ] add worker to clean expired oauth tokens  
							
							 
							
							
							
						 
						
							2019-05-22 15:44:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								714d8d4ef9 
								
							 
						 
						
							
							
								
								Merge branch 'feature/object-pruning' into 'develop'  
							
							 
							
							... 
							
							
							
							Object pruning
See merge request pleroma/pleroma!1181  
							
						 
						
							2019-05-22 11:04:30 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								ff363f70b5 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/keys' into 'develop'  
							
							 
							
							... 
							
							
							
							move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186  
							
						 
						
							2019-05-22 06:28:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1344c85e2f 
								
							 
						 
						
							
							
								
								salmon: fix credo  
							
							 
							
							
							
						 
						
							2019-05-22 05:58:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cdac5efd10 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/account_view_source.note' into 'develop'  
							
							 
							
							... 
							
							
							
							MastoAPI AccountView: fill source.note with plaintext version of note
Closes  #926 
See merge request pleroma/pleroma!1189  
							
						 
						
							2019-05-22 05:39:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0e2c215a00 
								
							 
						 
						
							
							
								
								MastoAPI AccountView: fill source.note with plaintext version of note  
							
							 
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/926  
							
						 
						
							2019-05-22 07:22:19 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								79c2cef2fb 
								
							 
						 
						
							
							
								
								Merge branch 'mongooseim-support' into 'develop'  
							
							 
							
							... 
							
							
							
							MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172  
							
						 
						
							2019-05-22 04:06:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ab6e15622b 
								
							 
						 
						
							
							
								
								Merge branch 'fix/api-fallback' into 'develop'  
							
							 
							
							... 
							
							
							
							Do not fallback to index.html for /api/* routes
Closes  #920 
See merge request pleroma/pleroma!1182  
							
						 
						
							2019-05-22 04:05:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								9134848170 
								
							 
						 
						
							
							
								
								Do not truncate DM when it contains newlines and safe_dm_mentions is set to true  
							
							 
							
							
							
						 
						
							2019-05-22 04:04:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								045803346d 
								
							 
						 
						
							
							
								
								move key generation functions into Pleroma.Keys module  
							
							 
							
							
							
						 
						
							2019-05-22 03:58:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a023ca004c 
								
							 
						 
						
							
							
								
								prune objects task: use Repo.delete_all()  
							
							 
							
							
							
						 
						
							2019-05-22 03:12:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								3ab9255eda 
								
							 
						 
						
							
							
								
								Respond with a 404 Not implemented JSON error message  
							
							 
							
							... 
							
							
							
							when requested API is not implemented 
							
						 
						
							2019-05-22 07:15:52 +08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								16b260fb19 
								
							 
						 
						
							
							
								
								add mix task to prune the object database using a configured retention period  
							
							 
							
							
							
						 
						
							2019-05-21 21:38:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								73df9d690d 
								
							 
						 
						
							
							
								
								object: fetcher: add support for reinjecting pruned objects  
							
							 
							
							
							
						 
						
							2019-05-21 21:38:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c2b0b82e6a 
								
							 
						 
						
							
							
								
								object: add Object.prune()  
							
							 
							
							
							
						 
						
							2019-05-21 21:38:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								be6b57193a 
								
							 
						 
						
							
							
								
								Merge branch 'trivial/increase-hackney-timeouts' into 'develop'  
							
							 
							
							... 
							
							
							
							http: bump connection timeout to 10 seconds
See merge request pleroma/pleroma!1183  
							
						 
						
							2019-05-21 05:15:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c972d0bb14 
								
							 
						 
						
							
							
								
								http: bump connection timeout to 10 seconds  
							
							 
							
							
							
						 
						
							2019-05-21 04:59:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								94caca924d 
								
							 
						 
						
							
							
								
								Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix prometheus-ecto error when not configured
Closes  #917 
See merge request pleroma/pleroma!1180  
							
						 
						
							2019-05-21 01:36:06 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								d4847b17ca 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'  
							
							 
							
							... 
							
							
							
							Add virtual :thread_muted? field
Closes  #901 
See merge request pleroma/pleroma!1178  
							
						 
						
							2019-05-20 23:30:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								f96e9b28bb 
								
							 
						 
						
							
							
								
								Fix prometheus-ecto error when not configured  
							
							 
							
							
							
						 
						
							2019-05-21 07:30:18 +08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								eb02edcad9 
								
							 
						 
						
							
							
								
								Add virtual :thread_muted? field  
							
							 
							
							... 
							
							
							
							that may be set when fetching activities 
							
						 
						
							2019-05-21 00:35:46 +08:00