rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c7acca2abb 
								
							 
						 
						
							
							
								
								Mastodon API: Sanitize display names  
							
							 
							
							... 
							
							
							
							Closes  #1000  
							
						 
						
							2019-06-18 14:12:11 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a440cf856d 
								
							 
						 
						
							
							
								
								Mastodon API: Return the token needed for the chat.  
							
							 
							
							
							
						 
						
							2019-06-15 10:59:35 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5965efb216 
								
							 
						 
						
							
							
								
								AccountView: Add user background.  
							
							 
							
							
							
						 
						
							2019-06-13 19:08:05 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4f2e359687 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/941  
							
							 
							
							
							
						 
						
							2019-06-04 09:49:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f13d6c7f78 
								
							 
						 
						
							
							
								
								update api to set skip_thread_containment  
							
							 
							
							
							
						 
						
							2019-06-03 21:02:57 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aaad85c4d9 
								
							 
						 
						
							
							
								
								AccountView: settings -> settings_store  
							
							 
							
							
							
						 
						
							2019-05-31 14:49:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								eb2963bc43 
								
							 
						 
						
							
							
								
								User: Add settings store to Info, AccountView  
							
							 
							
							... 
							
							
							
							This is to provide a generic frontend settings storage mechanism for all kinds
of frontends. 
							
						 
						
							2019-05-31 14:27:15 +02: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								46684db84d 
								
							 
						 
						
							
							
								
								Update account_view.ex  
							
							 
							
							
							
						 
						
							2019-05-17 09:53:44 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								68c75a08e8 
								
							 
						 
						
							
							
								
								MastoAPI account_view.ex: requested is false when following is true  
							
							 
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/903  
							
						 
						
							2019-05-17 07:44:09 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc8425659 
								
							 
						 
						
							
							
								
								Move settings to Source subentity  
							
							 
							
							
							
						 
						
							2019-04-25 10:31:14 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4baea6e6d9 
								
							 
						 
						
							
							
								
								Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API  
							
							 
							
							... 
							
							
							
							This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs 
							
						 
						
							2019-04-24 20:01:42 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								b9cdf6d3b9 
								
							 
						 
						
							
							
								
								Use User.get_cached* everywhere  
							
							 
							
							
							
						 
						
							2019-04-22 07:20:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								be8350baa2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/user-status-subscriptions  
							
							 
							
							
							
						 
						
							2019-04-10 10:44:54 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								9ca91cbb87 
								
							 
						 
						
							
							
								
								Change relationship direction of subscriptions  
							
							 
							
							
							
						 
						
							2019-04-05 17:02:07 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								cd90695a34 
								
							 
						 
						
							
							
								
								Add PUT /api/pleroma/notification_settings endpoint  
							
							 
							
							
							
						 
						
							2019-03-28 18:55:16 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c8f31e0bc2 
								
							 
						 
						
							
							
								
								Implement mastodon's reblog hiding feature  
							
							 
							
							
							
						 
						
							2019-03-15 14:18:21 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1536640962 
								
							 
						 
						
							
							
								
								mastodon api: embed relationship card under account card for Pleroma FE convenience  
							
							 
							
							
							
						 
						
							2019-02-27 13:01:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								5a46d37af9 
								
							 
						 
						
							
							
								
								Update the mute implementation to the current codebase  
							
							 
							
							... 
							
							
							
							Make it part of the info thing (and do a migration to ensure it's there) 
							
						 
						
							2019-02-19 23:09:16 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								f41f017bbc 
								
							 
						 
						
							
							
								
								Implement muting, add it to the mastodon API  
							
							 
							
							
							
						 
						
							2019-02-19 21:49:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251 
								
							 
						 
						
							
							
								
								de-group alias/es  
							
							 
							
							
							
						 
						
							2019-02-09 16:31:17 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8bcfac93a8 
								
							 
						 
						
							
							
								
								Make credo happy  
							
							 
							
							
							
						 
						
							2019-02-09 14:59:20 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a65c188593 
								
							 
						 
						
							
							
								
								Web.MastodonAPI.AccountView: Add is_moderator and is_admin  
							
							 
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/557  
							
						 
						
							2019-01-27 10:33:22 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								980b5288ed 
								
							 
						 
						
							
							
								
								update copyright years to 2019  
							
							 
							
							
							
						 
						
							2018-12-31 15:41:47 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0a41786624 
								
							 
						 
						
							
							
								
								[ #467 ] Refactored valid / invalid user rendering.  
							
							 
							
							
							
						 
						
							2018-12-28 22:47:42 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0d1788ce44 
								
							 
						 
						
							
							
								
								[ #471 ] Factored out User.visible_for?/2.  
							
							 
							
							
							
						 
						
							2018-12-28 14:35:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e6aeb1d4a5 
								
							 
						 
						
							
							
								
								[ #471 ] Prevented rendering of inactive local accounts.  
							
							 
							
							
							
						 
						
							2018-12-27 15:46:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							 
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								aed0f90287 
								
							 
						 
						
							
							
								
								[ #114 ] Added pleroma.confirmation_pending to user views, adjusted view tests.  
							
							 
							
							
							
						 
						
							2018-12-18 17:22:45 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7a2162bbcb 
								
							 
						 
						
							
							
								
								[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.  
							
							 
							
							
							
						 
						
							2018-12-06 22:26:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7bcb6a183a 
								
							 
						 
						
							
							
								
								[ #394 ] Refactoring.  
							
							 
							
							
							
						 
						
							2018-12-06 20:23:16 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7b19487389 
								
							 
						 
						
							
							
								
								[ #394 ] Added users.tags and admin routes to tag and untag users. Added tests.  
							
							 
							
							
							
						 
						
							2018-12-06 20:06:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0896cf4c0f 
								
							 
						 
						
							
							
								
								Fix most mastodon api bugs.  
							
							 
							
							
							
						 
						
							2018-11-20 20:12:39 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7f530f6f80 
								
							 
						 
						
							
							
								
								mastodon api: relationship view: better handle no pre-existing follow activity  
							
							 
							
							
							
						 
						
							2018-10-05 23:50:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3e751496e3 
								
							 
						 
						
							
							
								
								mastodon api: account view: fetch follow state and use it to populate requested field  
							
							 
							
							
							
						 
						
							2018-10-05 23:31:49 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8eaecadee 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)  
							
							 
							
							
							
						 
						
							2018-09-20 16:24:29 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ac486fc59b 
								
							 
						 
						
							
							
								
								everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly  
							
							 
							
							
							
						 
						
							2018-09-10 00:14:47 +00: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								359093d73b 
								
							 
						 
						
							
							
								
								Fake 2.4.0 API  
							
							 
							
							
							
						 
						
							2018-06-23 16:12:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c0ca9f82b9 
								
							 
						 
						
							
							
								
								mastodon api: properly track if an account is locked or not  
							
							 
							
							
							
						 
						
							2018-05-25 06:14:09 +00:00