Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4f2e359687 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/941  
							
							 
							
							
							
						 
						
							2019-06-04 09:49:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								64ada7f960 
								
							 
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2019-06-03 22:51:14 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								59a703fcbe 
								
							 
						 
						
							
							
								
								twitter api: user view: expose user notification settings under pleroma object  
							
							 
							
							
							
						 
						
							2019-05-25 05:31:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								85b5c60694 
								
							 
						 
						
							
							
								
								Pleroma.Formatter: width/height to class=emoji  
							
							 
							
							
							
						 
						
							2019-05-03 16:25:58 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								61ca2f7a4e 
								
							 
						 
						
							
							
								
								Fix rights in TwitterAPI's user entity being present only for  
							
							 
							
							... 
							
							
							
							Admins/Moderators
In !1093  I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators. 
							
						 
						
							2019-04-28 19:42:43 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1b3d921921 
								
							 
						 
						
							
							
								
								change Repo.get(User, id) => User.get_by_id(id)  
							
							 
							
							
							
						 
						
							2019-04-02 17:01:26 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder  
							
							 
							
							
							
						 
						
							2019-03-13 04:26:54 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								6b11011039 
								
							 
						 
						
							
							
								
								Added deactivated to the user view  
							
							 
							
							
							
						 
						
							2019-02-28 09:08:34 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								74518d0b60 
								
							 
						 
						
							
							
								
								hide_followings was renamed to hide_followers in the FE, but never synced up in the BE  
							
							 
							
							... 
							
							
							
							This was a dirty regex replace which worked on my server 
							
						 
						
							2019-02-06 22:34:44 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								035eaeb9b8 
								
							 
						 
						
							
							
								
								Allow to configure visibility for admin and moderator badges  
							
							 
							
							
							
						 
						
							2019-02-06 06:18:05 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								398c81f9c8 
								
							 
						 
						
							
							
								
								Add is_admin and is_moderator boolean fields to the user view  
							
							 
							
							
							
						 
						
							2019-02-06 02:10:06 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								16ce129e38 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings (fixed)  
							
							 
							
							
							
						 
						
							2019-02-03 21:55:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								486749064f 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/split-hide-network' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !733  
							
						 
						
							2019-02-01 20:22:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								50d6183893 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings  
							
							 
							
							
							
						 
						
							2019-01-28 21:40:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								4333fea1dc 
								
							 
						 
						
							
							
								
								Send "hide_network" in user_view  
							
							 
							
							
							
						 
						
							2019-01-23 19:47:51 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b43d630f30 
								
							 
						 
						
							
							
								
								Web.TwitterAPI.UserView: Add rights.admin  
							
							 
							
							
							
						 
						
							2018-12-28 17:38:32 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								89b3729afa 
								
							 
						 
						
							
							
								
								fix warnings  
							
							 
							
							
							
						 
						
							2018-12-12 09:09:19 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								48b95a9b95 
								
							 
						 
						
							
							
								
								Assorted fixes.  
							
							 
							
							
							
						 
						
							2018-11-30 17:08:02 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								db78c72868 
								
							 
						 
						
							
							
								
								Twitter API: Add tests for nil names.  
							
							 
							
							
							
						 
						
							2018-11-12 17:02:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a74daabfae 
								
							 
						 
						
							
							
								
								[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields  
							
							 
							
							
							
						 
						
							2018-09-28 11:17:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								82b57ebad1 
								
							 
						 
						
							
							
								
								[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"  
							
							 
							
							
							
						 
						
							2018-09-28 10:44:45 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								56577d8b48 
								
							 
						 
						
							
							
								
								twitter api: add no_rich_text option to userview for account prefs  
							
							 
							
							
							
						 
						
							2018-09-22 03:24:40 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								834515fb51 
								
							 
						 
						
							
							
								
								formatter: don't add XSS emoji  
							
							 
							
							
							
						 
						
							2018-09-02 00:04:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ensra 
								
							 
						 
						
							
							
							
							
								
							
							
								e883587cc3 
								
							 
						 
						
							
							
								
								this should be looking at the follower's bio, not the user's bio.  
							
							 
							
							... 
							
							
							
							fixes test. 
							
						 
						
							2018-08-21 15:25:21 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ensra 
								
							 
						 
						
							
							
							
							
								
							
							
								f533daffdb 
								
							 
						 
						
							
							
								
								sync bio sanitization code in tests  
							
							 
							
							
							
						 
						
							2018-08-21 15:24:06 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								cee63ad3f7 
								
							 
						 
						
							
							
								
								TwitterAPI user view: add screen_name_html and description_html.  
							
							 
							
							
							
						 
						
							2018-08-08 08:38:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								32211c4ada 
								
							 
						 
						
							
							
								
								tests: add default_scope where appropriate  
							
							 
							
							
							
						 
						
							2018-06-27 13:17:07 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c773f42ca4 
								
							 
						 
						
							
							
								
								tests: update twitterapi user view tests for new locked variable  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thog 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e55c6f311b 
								
							 
						 
						
							
							
								
								Migrate to comeonin 4 and Cachex 3  
							
							 
							
							... 
							
							
							
							Also fix some warning in the code and add a missing alias 
							
						 
						
							2018-05-20 20:08:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4afbef39f4 
								
							 
						 
						
							
							
								
								Format the code.  
							
							 
							
							
							
						 
						
							2018-03-30 15:01:53 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5bc810c452 
								
							 
						 
						
							
							
								
								Add moderator function.  
							
							 
							
							
							
						 
						
							2018-02-20 18:44:50 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								26ccb768d3 
								
							 
						 
						
							
							
								
								Make test output easier to read.  
							
							 
							
							
							
						 
						
							2018-02-12 10:14:11 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								61c16193de 
								
							 
						 
						
							
							
								
								Merge branch 'move-backend-images' into 'develop'  
							
							 
							
							... 
							
							
							
							Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60  
							
						 
						
							2018-02-03 13:05:20 +00: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 
								
							 
						 
						
							
							
							
							
								
							
							
								ab83e0de6d 
								
							 
						 
						
							
							
								
								TwitterAPI: Add is_local to user view.  
							
							 
							
							
							
						 
						
							2018-02-01 21:41:19 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								14b086eec2 
								
							 
						 
						
							
							
								
								Add a default profile picture and banner.  
							
							 
							
							... 
							
							
							
							This removes the placehold.it dependency. 
							
						 
						
							2018-01-15 22:18:17 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								9223038319 
								
							 
						 
						
							
							
								
								Fix some more tests.  
							
							 
							
							
							
						 
						
							2017-12-11 21:01:36 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								edc3e5bc30 
								
							 
						 
						
							
							
								
								Make users in tests follow themselves by default.  
							
							 
							
							... 
							
							
							
							Also fix the semantics of all tests to match. 
							
						 
						
							2017-11-20 07:52:02 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								f7fc048aeb 
								
							 
						 
						
							
							
								
								TwitterAPI user view: add follows_you.  
							
							 
							
							
							
						 
						
							2017-11-08 19:13:03 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								4656cb9b99 
								
							 
						 
						
							
							
								
								TwitterAPI user view: add blocks.  
							
							 
							
							
							
						 
						
							2017-11-08 13:02:00 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								50409326a8 
								
							 
						 
						
							
							
								
								Refactor posting and make character limit configurable.  
							
							 
							
							
							
						 
						
							2017-09-15 14:17:36 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								4b03c43fd7 
								
							 
						 
						
							
							
								
								fix specs.  
							
							 
							
							
							
						 
						
							2017-08-29 17:22:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								72ca58c540 
								
							 
						 
						
							
							
								
								Save follower count and note count in user.  
							
							 
							
							
							
						 
						
							2017-07-22 17:42:15 +02:00