kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								cf426a719d 
								
							 
						 
						
							
							
								
								Merge branch 'with-mutes' into 'develop'  
							
							... 
							
							
							
							Add `with_muted` param.
Closes  #683 
See merge request pleroma/pleroma!872  
							
						 
						
							2019-02-28 10:22:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								6b11011039 
								
							 
						 
						
							
							
								
								Added deactivated to the user view  
							
							
							
						 
						
							2019-02-28 09:08:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9ade1242c2 
								
							 
						 
						
							
							
								
								Add user muted status info to twitterapi.  
							
							
							
						 
						
							2019-02-27 16:52:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8bb7e19b38 
								
							 
						 
						
							
							
								
								test: de-group alias/es  
							
							
							
						 
						
							2019-02-11 03:44:15 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0a82a7e6d6 
								
							 
						 
						
							
							
								
								Merge branch 'feature/split-hide-network' into 'develop'  
							
							... 
							
							
							
							Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733  
							
						 
						
							2019-02-01 17:05:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								50d6183893 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings  
							
							
							
						 
						
							2019-01-28 21:40:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								020b3b29d9 
								
							 
						 
						
							
							
								
								test: update twitterapi tests  
							
							
							
						 
						
							2019-01-28 05:53:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								4333fea1dc 
								
							 
						 
						
							
							
								
								Send "hide_network" in user_view  
							
							
							
						 
						
							2019-01-23 19:47:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								98c8184c1f 
								
							 
						 
						
							
							
								
								Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1  
							
							
							
						 
						
							2019-01-21 08:00:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								85a5be6220 
								
							 
						 
						
							
							
								
								tests: fixup  
							
							
							
						 
						
							2019-01-16 04:09:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								7f5efddd6e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/pinned-posts' into 'develop'  
							
							... 
							
							
							
							Pinned Statuses
Closes  #440 
See merge request pleroma/pleroma!636  
							
						 
						
							2019-01-10 02:39:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								1881680e28 
								
							 
						 
						
							
							
								
								Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'  
							
							... 
							
							
							
							Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647  
							
						 
						
							2019-01-09 16:26:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								44a1e69484 
								
							 
						 
						
							
							
								
								Add Twitter API for the pinned statuses  
							
							... 
							
							
							
							```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
``` 
							
						 
						
							2019-01-09 19:54:19 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a16b17cc61 
								
							 
						 
						
							
							
								
								Actually put some onformation in the error user, make it actually properly parse  
							
							... 
							
							
							
							in conversations. 
							
						 
						
							2019-01-07 20:59:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7382adf407 
								
							 
						 
						
							
							
								
								Make TwAPI UserView more resilient to issues.  
							
							... 
							
							
							
							Will work for missing users and badly migrated users. 
							
						 
						
							2019-01-07 12:41:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								52493467ac 
								
							 
						 
						
							
							
								
								Twitter API: Add a summary_html field.  
							
							... 
							
							
							
							The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though. 
							
						 
						
							2019-01-06 10:19:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								57df7d6e1d 
								
							 
						 
						
							
							
								
								Add tests for emoji and lack of HTML in summaries.  
							
							
							
						 
						
							2019-01-05 21:46:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								096e121879 
								
							 
						 
						
							
							
								
								Remove redundant comma.  
							
							
							
						 
						
							2019-01-05 18:25:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								6556be344d 
								
							 
						 
						
							
							
								
								Resolve some test failures.  
							
							
							
						 
						
							2019-01-05 18:20:42 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a2bceaf688 
								
							 
						 
						
							
							
								
								tests: twitter api: add test proving that peertube videos are correctly handled  
							
							
							
						 
						
							2018-12-23 14:00:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								873938d223 
								
							 
						 
						
							
							
								
								tests: twitter api: activity view test: enable tesla mock  
							
							
							
						 
						
							2018-12-23 14:00:54 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								92a5133c42 
								
							 
						 
						
							
							
								
								fix text field  
							
							
							
						 
						
							2018-12-17 22:53:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								61ad2ce422 
								
							 
						 
						
							
							
								
								TwitterAPI: Include favorited post in json  
							
							
							
						 
						
							2018-12-14 08:24:18 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vald 
								
							 
						 
						
							
							
							
							
								
							
							
								3c8ffe7ed3 
								
							 
						 
						
							
							
								
								resolved activity view test  
							
							
							
						 
						
							2018-12-06 01:54:04 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6cfba7db8d 
								
							 
						 
						
							
							
								
								tests: twitterapi: add additional fields  
							
							
							
						 
						
							2018-10-25 04:06:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9563f3766d 
								
							 
						 
						
							
							
								
								tests: update for new in_reply_to_screen_name field  
							
							
							
						 
						
							2018-10-25 03:03:44 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								b7923aa304 
								
							 
						 
						
							
							
								
								Merge branch 'hotfix_broken_likes' into 'develop'  
							
							... 
							
							
							
							hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284  
							
						 
						
							2018-09-02 12:37:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								834515fb51 
								
							 
						 
						
							
							
								
								formatter: don't add XSS emoji  
							
							
							
						 
						
							2018-09-02 00:04:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								0f1c629d65 
								
							 
						 
						
							
							
								
								better solution, added test.  
							
							
							
						 
						
							2018-08-27 17:07:26 +03: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 
								
							 
						 
						
							
							
							
							
								
							
							
								4fb64c1d86 
								
							 
						 
						
							
							
								
								testsuite: twitter api: add summary where necessary  
							
							
							
						 
						
							2018-07-12 16:12:25 +00:00