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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Kühl 
								
							 
						 
						
							
							
							
							
								
							
							
								b60d232719 
								
							 
						 
						
							
							
								
								AccountView: sensitive is supposed to be a boolean, not a string  
							
							 
							
							
							
						 
						
							2018-09-01 23:10:48 +02: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ddc6f32b75 
								
							 
						 
						
							
							
								
								Fix Mastodon API when actor's nickname is null  
							
							 
							
							
							
						 
						
							2018-08-29 16:32:50 +02: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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ensra 
								
							 
						 
						
							
							
							
							
								
							
							
								175f0bebbc 
								
							 
						 
						
							
							
								
								mastodon api: sanitize the bio HTML  
							
							 
							
							
							
						 
						
							2018-08-21 10:53:53 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								c2d1a5e9c4 
								
							 
						 
						
							
							
								
								MastoAPI AccountView: render profile emoji.  
							
							 
							
							
							
						 
						
							2018-08-07 21:56:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								cd19d37a90 
								
							 
						 
						
							
							
								
								mastodon api: use object name as alt text  
							
							 
							
							
							
						 
						
							2018-07-17 03:40:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								4a922305af 
								
							 
						 
						
							
							
								
								Merge branch 'feature/article-support' into 'develop'  
							
							 
							
							... 
							
							
							
							article support (plume, etc)
See merge request pleroma/pleroma!240  
							
						 
						
							2018-07-12 05:58:39 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7a351cb36f 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses  
							
							 
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/231  
							
						 
						
							2018-07-12 01:57:25 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								971bb4f2bd 
								
							 
						 
						
							
							
								
								activity interpretation: formatting  
							
							 
							
							
							
						 
						
							2018-06-27 13:38:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ea982e7503 
								
							 
						 
						
							
							
								
								mastodon api: add interpreter for Article activity types  
							
							 
							
							
							
						 
						
							2018-06-27 13:38:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								359093d73b 
								
							 
						 
						
							
							
								
								Fake 2.4.0 API  
							
							 
							
							
							
						 
						
							2018-06-23 16:12:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								72c2915ecd 
								
							 
						 
						
							
							
								
								Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads  
							
							 
							
							
							
						 
						
							2018-06-15 22:14:17 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4b3ec53514 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api  
							
							 
							
							
							
						 
						
							2018-05-26 16:00:59 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c0ca9f82b9 
								
							 
						 
						
							
							
								
								mastodon api: properly track if an account is locked or not  
							
							 
							
							
							
						 
						
							2018-05-25 06:14:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								f3a71f2986 
								
							 
						 
						
							
							
								
								Merge branch 'feature/lists' into 'develop'  
							
							 
							
							... 
							
							
							
							Mastodon List API
See merge request pleroma/pleroma!138  
							
						 
						
							2018-05-24 20:22:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								a8369db4f2 
								
							 
						 
						
							
							
								
								MastoAPI: add lists.  
							
							 
							
							
							
						 
						
							2018-05-24 13:18:39 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									csaurus 
								
							 
						 
						
							
							
							
							
								
							
							
								2ce48c1a42 
								
							 
						 
						
							
							
								
								Formatting  
							
							 
							
							
							
						 
						
							2018-05-13 15:36:41 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									csaurus 
								
							 
						 
						
							
							
							
							
								
							
							
								9aabff4883 
								
							 
						 
						
							
							
								
								Fix tests.  
							
							 
							
							
							
						 
						
							2018-05-13 15:33:59 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								31ea9cbcd8 
								
							 
						 
						
							
							
								
								Group def renders together to fix warning  
							
							 
							
							
							
						 
						
							2018-05-04 22:28:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								aaacebd906 
								
							 
						 
						
							
							
								
								Fix unused variables, imports, and aliases  
							
							 
							
							
							
						 
						
							2018-05-04 21:42:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Morgan Bazalgette 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5e4bb4ad92 
								
							 
						 
						
							
							
								
								masto api: run emojis through mediaproxy  
							
							 
							
							... 
							
							
							
							fixes  #107  
							
						 
						
							2018-04-02 12:04:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4afbef39f4 
								
							 
						 
						
							
							
								
								Format the code.  
							
							 
							
							
							
						 
						
							2018-03-30 15:01:53 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								37e5014d3e 
								
							 
						 
						
							
							
								
								Reduce OP fetching queries.  
							
							 
							
							
							
						 
						
							2018-03-27 18:18:24 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ff7afe46b9 
								
							 
						 
						
							
							
								
								Don't try to fetch OP if none is there.  
							
							 
							
							
							
						 
						
							2018-03-27 17:43:08 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								09de76ad5a 
								
							 
						 
						
							
							
								
								Return "audio" info in mastodon api.  
							
							 
							
							
							
						 
						
							2018-03-25 17:08:54 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fbe9aa3506 
								
							 
						 
						
							
							
								
								Strip html from emoji stuff.  
							
							 
							
							
							
						 
						
							2018-03-23 19:52:08 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								000b3f1837 
								
							 
						 
						
							
							
								
								mastodon api: fix rendering the mentions JSON  
							
							 
							
							... 
							
							
							
							Signed-off-by: lain <lain@soykaf.club> 
							
						 
						
							2018-03-16 11:25:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								95e6e82138 
								
							 
						 
						
							
							
								
								Correctly display accounts without name.  
							
							 
							
							
							
						 
						
							2018-02-22 19:22:10 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								486e205810 
								
							 
						 
						
							
							
								
								Remove some noise.  
							
							 
							
							
							
						 
						
							2018-02-20 08:52:31 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d4b08dd838 
								
							 
						 
						
							
							
								
								MastodonAPI: Post with visibility settings  
							
							 
							
							
							
						 
						
							2018-02-18 14:56:36 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								539340d914 
								
							 
						 
						
							
							
								
								Handle sensitive property.  
							
							 
							
							
							
						 
						
							2018-02-18 14:14:16 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								912ca56e59 
								
							 
						 
						
							
							
								
								Mastodon StatusView: Return correct visibility.  
							
							 
							
							
							
						 
						
							2018-02-18 13:51:51 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								14b086eec2 
								
							 
						 
						
							
							
								
								Add a default profile picture and banner.  
							
							 
							
							... 
							
							
							
							This removes the placehold.it dependency. 
							
						 
						
							2018-01-15 22:18:17 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5f35fdcf5d 
								
							 
						 
						
							
							
								
								media proxy: good enough wip  
							
							 
							
							
							
						 
						
							2017-11-28 20:50:34 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								fa19de97ba 
								
							 
						 
						
							
							
								
								MastoAPI: no more than 4 attachments.  
							
							 
							
							
							
						 
						
							2017-11-20 22:49:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thog 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								59770c3f5c 
								
							 
						 
						
							
							
								
								Fix all compilation warnings  
							
							 
							
							
							
						 
						
							2017-11-19 02:22:07 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								ced0d64d75 
								
							 
						 
						
							
							
								
								MastoAPI: Make attachment ids strings.  
							
							 
							
							
							
						 
						
							2017-11-15 18:58:39 +01:00