William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								df00a364fb 
								
							 
						 
						
							
							
								
								mastodon api: formatting  
							
							
							
						 
						
							2018-09-22 02:53:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								958e085acb 
								
							 
						 
						
							
							
								
								mastodon api: add support for user-supplied html policy  
							
							
							
						 
						
							2018-09-22 02:53:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								40c51f118f 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0  
							
							
							
						 
						
							2018-09-20 16:48:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f74725df41 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables  
							
							
							
						 
						
							2018-09-20 16:37:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8eaecadee 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)  
							
							
							
						 
						
							2018-09-20 16:24:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								43d0b7bf7a 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView] add replies_count  
							
							
							
						 
						
							2018-09-20 16:10:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0cac493fdc 
								
							 
						 
						
							
							
								
								mastodon api: default attachment type to image if one is not present  
							
							
							
						 
						
							2018-09-19 04:59:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin Kühl 
								
							 
						 
						
							
							
							
							
								
							
							
								f4fcea5258 
								
							 
						 
						
							
							
								
								Revert "Mastodon API: Fake support for loading filters"  
							
							... 
							
							
							
							This reverts commit c1d07da4e16e030129fb 
							
						 
						
							2018-09-18 11:59:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c2650f0ffb 
								
							 
						 
						
							
							
								
								Merge branch 'feature/html-scrub-policy' into 'develop'  
							
							... 
							
							
							
							html scrub policy
See merge request pleroma/pleroma!339  
							
						 
						
							2018-09-16 01:05:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shadowfacts 
								
							 
						 
						
							
							
							
							
								
							
							
								39aed5348a 
								
							 
						 
						
							
							
								
								Add visible_in_picker to status emojis  
							
							
							
						 
						
							2018-09-10 23:32:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ac486fc59b 
								
							 
						 
						
							
							
								
								everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly  
							
							
							
						 
						
							2018-09-10 00:14:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								4e1bb7bccb 
								
							 
						 
						
							
							
								
								make limit for /api/v1/suggestions  
							
							
							
						 
						
							2018-09-09 13:57:23 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin Kühl 
								
							 
						 
						
							
							
							
							
								
							
							
								c1d07da4e1 
								
							 
						 
						
							
							
								
								Mastodon API: Fake support for loading filters  
							
							
							
						 
						
							2018-09-07 16:12:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin Kühl 
								
							 
						 
						
							
							
							
							
								
							
							
								619f67768a 
								
							 
						 
						
							
							
								
								Mastodon API: Add unsupported attributes to relationship responses  
							
							... 
							
							
							
							These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values. 
							
						 
						
							2018-09-07 16:12:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								4a3dbd9d4e 
								
							 
						 
						
							
							
								
								Merge branch 'fix/sign-in-with-toot' into 'develop'  
							
							... 
							
							
							
							Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306  
							
						 
						
							2018-09-05 18:20:26 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									shadowfacts 
								
							 
						 
						
							
							
							
							
								
							
							
								35515cfa66 
								
							 
						 
						
							
							
								
								Update mastodon_api_controller.ex  
							
							
							
						 
						
							2018-09-03 01:58:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shadowfacts 
								
							 
						 
						
							
							
							
							
								
							
							
								26f8697400 
								
							 
						 
						
							
							
								
								Update mastodon_api_controller.ex  
							
							
							
						 
						
							2018-09-03 01:52:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shadowfacts 
								
							 
						 
						
							
							
							
							
								
							
							
								2b2bd0e047 
								
							 
						 
						
							
							
								
								Render notification IDs as strings, not numbers  
							
							
							
						 
						
							2018-09-03 01:40:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin Kühl 
								
							 
						 
						
							
							
							
							
								
							
							
								b60d232719 
								
							 
						 
						
							
							
								
								AccountView: sensitive is supposed to be a boolean, not a string  
							
							
							
						 
						
							2018-09-01 23:10:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								2e2f458705 
								
							 
						 
						
							
							
								
								Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'  
							
							... 
							
							
							
							Clean code duplication in MastoAPI search(v1/v2)
See merge request pleroma/pleroma!316  
							
						 
						
							2018-09-01 09:12:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Will Pearson 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2a0e3551 
								
							 
						 
						
							
							
								
								Specify default scope in verify_credentials  
							
							... 
							
							
							
							Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value. 
							
						 
						
							2018-08-31 21:04:46 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8885d16e1b 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication  
							
							
							
						 
						
							2018-09-01 03:11:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e838969495 
								
							 
						 
						
							
							
								
								Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'  
							
							... 
							
							
							
							use media proxy for the suggestions api
See merge request pleroma/pleroma!305  
							
						 
						
							2018-08-30 23:06:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ddc6f32b75 
								
							 
						 
						
							
							
								
								Fix Mastodon API when actor's nickname is null  
							
							
							
						 
						
							2018-08-29 16:32:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ded9091206 
								
							 
						 
						
							
							
								
								mastodon api: use bounded AP object graph query to enforce containment of private statuses  
							
							
							
						 
						
							2018-08-29 08:51:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								6cbfb5ab5d 
								
							 
						 
						
							
							
								
								use media proxy for suggestions api  
							
							
							
						 
						
							2018-08-28 17:01:17 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6973b77e94 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.FilterView] fix expires_at being a unsafe variable  
							
							
							
						 
						
							2018-08-27 15:09:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9bddb39ff0 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.FilterView]: expires_at should be null when N/A  
							
							
							
						 
						
							2018-08-27 15:09:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d571a571fe 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.4.3  
							
							
							
						 
						
							2018-08-27 15:09:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e030129fb 
								
							 
						 
						
							
							
								
								[MastodonAPI] Add filters  
							
							
							
						 
						
							2018-08-27 15:09:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a5adb251ab 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.AccountView]: Add fields support  
							
							
							
						 
						
							2018-08-27 15:09:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d008f2d69c 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.AccountView]: Add bot field  
							
							
							
						 
						
							2018-08-27 15:09:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								83efaa3af6 
								
							 
						 
						
							
							
								
								[MastodonAPI] Add streaming of hashtags  
							
							
							
						 
						
							2018-08-27 15:08:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hakabahitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								bf9f68b681 
								
							 
						 
						
							
							
								
								debug  
							
							
							
						 
						
							2018-08-23 11:52:18 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5dde6e4a00 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos  
							
							
							
						 
						
							2018-08-22 01:46:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								f6b06d2ac8 
								
							 
						 
						
							
							
								
								Merge branch 'feature/peertube_2' into 'develop'  
							
							... 
							
							
							
							rebase/update of feature/peertube
See merge request pleroma/pleroma!217  
							
						 
						
							2018-08-21 16:58:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								046741c60d 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles  
							
							
							
						 
						
							2018-08-21 18:34:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3b8ef24532 
								
							 
						 
						
							
							
								
								Fix attachement rendering  
							
							
							
						 
						
							2018-08-21 18:24:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a6b021a52b 
								
							 
						 
						
							
							
								
								Render peertube videos in mastodon.  
							
							
							
						 
						
							2018-08-21 18:24:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c381d0b577 
								
							 
						 
						
							
							
								
								Use activitypub to fetch posts.  
							
							... 
							
							
							
							This falls back to ostatus. 
							
						 
						
							2018-08-21 18:24:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ensra 
								
							 
						 
						
							
							
							
							
								
							
							
								175f0bebbc 
								
							 
						 
						
							
							
								
								mastodon api: sanitize the bio HTML  
							
							
							
						 
						
							2018-08-21 10:53:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shadowfacts 
								
							 
						 
						
							
							
							
							
								
							
							
								6698749073 
								
							 
						 
						
							
							
								
								Fix typo in app creation response  
							
							... 
							
							
							
							Mastodon sends redirect_uri (singular), so should Pleroma. 
							
						 
						
							2018-08-17 12:48:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a3ef2ebb35 
								
							 
						 
						
							
							
								
								mastodon api controller: client_name, not name  
							
							
							
						 
						
							2018-08-16 23:50:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b5a92b1199 
								
							 
						 
						
							
							
								
								mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does  
							
							
							
						 
						
							2018-08-16 23:40:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								9908cf8fda 
								
							 
						 
						
							
							
								
								Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'  
							
							... 
							
							
							
							Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254  
							
						 
						
							2018-08-15 07:47:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								c2d1a5e9c4 
								
							 
						 
						
							
							
								
								MastoAPI AccountView: render profile emoji.  
							
							
							
						 
						
							2018-08-07 21:56:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								cc9c062b55 
								
							 
						 
						
							
							
								
								merge  
							
							
							
						 
						
							2018-07-19 17:42:00 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								6f23fb53d3 
								
							 
						 
						
							
							
								
								Merge branch 'feature/fe-configuration' into 'develop'  
							
							... 
							
							
							
							serverside frontend configuration
See merge request pleroma/pleroma!256  
							
						 
						
							2018-07-19 07:31:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								b12d17d2ce 
								
							 
						 
						
							
							
								
								configurable timeout  
							
							
							
						 
						
							2018-07-18 13:36:20 +09:00