Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								d6094b405d 
								
							 
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								409bcad54b 
								
							 
						 
						
							
							
								
								Mastodon API: Set follower/following counters to 0 when hiding  
							
							 
							
							... 
							
							
							
							followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency. 
							
						 
						
							2019-08-09 16:53:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4504135894 
								
							 
						 
						
							
							
								
								Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships)  
							
							 
							
							
							
						 
						
							2019-07-24 15:12:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								520ee6c591 
								
							 
						 
						
							
							
								
								Add pleroma.deactivated to the Account entity (Mastodon API)  
							
							 
							
							
							
						 
						
							2019-07-16 11:14:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								c4ca142e14 
								
							 
						 
						
							
							
								
								Add the blocked_by attribute to the relationship API (GET /api/v1/accounts/relationships)  
							
							 
							
							
							
						 
						
							2019-07-16 11:04:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c7acca2abb 
								
							 
						 
						
							
							
								
								Mastodon API: Sanitize display names  
							
							 
							
							... 
							
							
							
							Closes  #1000  
							
						 
						
							2019-06-18 14:12:11 +03: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9d2563a3de 
								
							 
						 
						
							
							
								
								Merge branch 'generic-fe-settings' into 'develop'  
							
							 
							
							... 
							
							
							
							Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221  
							
						 
						
							2019-06-04 05:43:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								64ada7f960 
								
							 
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2019-06-03 22:51:14 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								45e4642a58 
								
							 
						 
						
							
							
								
								tests: chase remote/local removal  
							
							 
							
							
							
						 
						
							2019-05-26 00:20:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1542cccbbc 
								
							 
						 
						
							
							
								
								tests: chase notification setting changes  
							
							 
							
							
							
						 
						
							2019-05-25 05:22:13 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								13c298d354 
								
							 
						 
						
							
							
								
								Fix tests to assume reblogs shown by default  
							
							 
							
							
							
						 
						
							2019-03-15 14:18:21 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder  
							
							 
							
							
							
						 
						
							2019-03-13 04:26:54 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								3c08d229db 
								
							 
						 
						
							
							
								
								tests: add legal boilerplate  
							
							 
							
							
							
						 
						
							2018-12-23 20:57:10 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								abbf347dc7 
								
							 
						 
						
							
							
								
								[ #394 ] View tests fix.  
							
							 
							
							
							
						 
						
							2018-12-06 20:38:52 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c196754b4d 
								
							 
						 
						
							
							
								
								mastodon api: account view: fix tests  
							
							 
							
							
							
						 
						
							2018-11-20 18:54:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8eaecadee 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)  
							
							 
							
							
							
						 
						
							2018-09-20 16:24:29 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Kühl 
								
							 
						 
						
							
							
							
							
								
							
							
								ff38ffd9f8 
								
							 
						 
						
							
							
								
								Fix the tests  
							
							 
							
							
							
						 
						
							2018-09-05 22:20:59 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Kühl 
								
							 
						 
						
							
							
							
							
								
							
							
								b60d232719 
								
							 
						 
						
							
							
								
								AccountView: sensitive is supposed to be a boolean, not a string  
							
							 
							
							
							
						 
						
							2018-09-01 23:10:48 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d008f2d69c 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.AccountView]: Add bot field  
							
							 
							
							
							
						 
						
							2018-08-27 15:09:04 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ensra 
								
							 
						 
						
							
							
							
							
								
							
							
								2b5db840ee 
								
							 
						 
						
							
							
								
								attempt to add html validation to mastodon api test case  
							
							 
							
							
							
						 
						
							2018-08-21 15:41:32 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								ed9738e031 
								
							 
						 
						
							
							
								
								Add tests for emoji in user profiles  
							
							 
							
							... 
							
							
							
							Also use the correct field in TwitterAPI... 
							
						 
						
							2018-08-08 09:24:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								359093d73b 
								
							 
						 
						
							
							
								
								Fake 2.4.0 API  
							
							 
							
							
							
						 
						
							2018-06-23 16:12:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								590e8d5555 
								
							 
						 
						
							
							
								
								tests: fix a completely bogus mastodon api test  
							
							 
							
							
							
						 
						
							2018-06-19 08:53:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4afbef39f4 
								
							 
						 
						
							
							
								
								Format the code.  
							
							 
							
							
							
						 
						
							2018-03-30 15:01:53 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								ea6d1b2b17 
								
							 
						 
						
							
							
								
								move avi.png & banner.png from /priv/static/static to /priv/static/images  
							
							 
							
							
							
						 
						
							2018-02-03 20:43:14 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								14b086eec2 
								
							 
						 
						
							
							
								
								Add a default profile picture and banner.  
							
							 
							
							... 
							
							
							
							This removes the placehold.it dependency. 
							
						 
						
							2018-01-15 22:18:17 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								6e9c22c0af 
								
							 
						 
						
							
							
								
								MastoAPI: Use string ids everywhere.  
							
							 
							
							
							
						 
						
							2017-11-10 17:18:19 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								33beb51da4 
								
							 
						 
						
							
							
								
								MastoAPI: Add blocking to AccountView.  
							
							 
							
							
							
						 
						
							2017-11-03 08:23:31 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								0872f5f394 
								
							 
						 
						
							
							
								
								Add undocumented default user default settings.  
							
							 
							
							
							
						 
						
							2017-09-16 11:52:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								d659fcc195 
								
							 
						 
						
							
							
								
								MastoAPI: Fix date in account view.  
							
							 
							
							
							
						 
						
							2017-09-15 17:50:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								e6286152b9 
								
							 
						 
						
							
							
								
								Fix logic.  
							
							 
							
							
							
						 
						
							2017-09-13 16:05:39 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								49929321c7 
								
							 
						 
						
							
							
								
								Add relationships to masto api.  
							
							 
							
							
							
						 
						
							2017-09-13 15:55:10 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								44a650235b 
								
							 
						 
						
							
							
								
								MastoAPI: Remove domain ending from account name.  
							
							 
							
							
							
						 
						
							2017-09-12 09:34:39 +02:00