Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								eb02edcad9 
								
							 
						 
						
							
							
								
								Add virtual :thread_muted? field  
							
							 
							
							... 
							
							
							
							that may be set when fetching activities 
							
						 
						
							2019-05-21 00:35:46 +08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb3451023 
								
							 
						 
						
							
							
								
								CommonAPI: Refactor visibility, forbid public to private replies.  
							
							 
							
							
							
						 
						
							2019-05-15 16:30:08 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								2a54e8c1f5 
								
							 
						 
						
							
							
								
								Use "repeated" instead of "retweeted" for repeated statuses in Twitter API  
							
							 
							
							... 
							
							
							
							This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533  
							
						 
						
							2019-05-09 19:58:34 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								627e5a0a49 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/database-compaction  
							
							 
							
							
							
						 
						
							2019-04-17 12:22:32 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5d73dca064 
								
							 
						 
						
							
							
								
								Remove inReplyToStatusId  
							
							 
							
							
							
						 
						
							2019-04-15 11:50:36 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f0f30019e1 
								
							 
						 
						
							
							
								
								Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi  
							
							 
							
							
							
						 
						
							2019-04-05 15:19:44 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1b33986bfa 
								
							 
						 
						
							
							
								
								Fix text being nullable in TwitterAPI  
							
							 
							
							
							
						 
						
							2019-03-23 00:10:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								fea3696799 
								
							 
						 
						
							
							
								
								common api: move context functions from twitterapi  
							
							 
							
							
							
						 
						
							2019-03-21 23:24:04 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder  
							
							 
							
							
							
						 
						
							2019-03-13 04:26:54 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9ade1242c2 
								
							 
						 
						
							
							
								
								Add user muted status info to twitterapi.  
							
							 
							
							
							
						 
						
							2019-02-27 16:52:03 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251 
								
							 
						 
						
							
							
								
								de-group alias/es  
							
							 
							
							
							
						 
						
							2019-02-09 16:31:17 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								60ea29dfe6 
								
							 
						 
						
							
							
								
								Credo fixes: alias grouping/ordering  
							
							 
							
							
							
						 
						
							2019-02-09 14:59:20 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8e42251e06 
								
							 
						 
						
							
							
								
								rich media: add helpers module, use instead of MastodonAPI module  
							
							 
							
							
							
						 
						
							2019-01-28 06:04:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5d895093fd 
								
							 
						 
						
							
							
								
								twitter api: embed card in twitterapi posts  
							
							 
							
							
							
						 
						
							2019-01-28 05:53:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f83bae7c22 
								
							 
						 
						
							
							
								
								Views: wrap activity rendering in a rescue  
							
							 
							
							... 
							
							
							
							this avoids complete timeline breakage when an activity fucks up
rendering. 
							
						 
						
							2019-01-27 19:16:20 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								4c99b6d35a 
								
							 
						 
						
							
							
								
								Merge branch 'fix/tusky-dm' into 'develop'  
							
							 
							
							... 
							
							
							
							Add actor to recipients list
Closes  #390 
See merge request pleroma/pleroma!683  
							
						 
						
							2019-01-25 05:19:32 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								9274cabe01 
								
							 
						 
						
							
							
								
								Use correct logic to determine "attentions" list  
							
							 
							
							
							
						 
						
							2019-01-24 23:30:43 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								943324b661 
								
							 
						 
						
							
							
								
								MastoAPI: Don't break on missing users.  
							
							 
							
							
							
						 
						
							2019-01-16 15:13:09 +01: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 
								
							 
						 
						
							
							
							
							
								
							
							
								145d6fe6e9 
								
							 
						 
						
							
							
								
								Merge branch 'emoji-in-summary' into 'develop'  
							
							 
							
							... 
							
							
							
							Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631  
							
						 
						
							2019-01-05 21:52:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								0787f0dfbe 
								
							 
						 
						
							
							
								
								Strip HTML in and allow emoji in summaries.  
							
							 
							
							
							
						 
						
							2019-01-05 17:28:47 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								846082e54f 
								
							 
						 
						
							
							
								
								Different caches based on the module. Remove scrubber version since it is not relevant anymore  
							
							 
							
							
							
						 
						
							2019-01-05 00:19:46 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								980b5288ed 
								
							 
						 
						
							
							
								
								update copyright years to 2019  
							
							 
							
							
							
						 
						
							2018-12-31 15:41:47 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								7e09c2bd7d 
								
							 
						 
						
							
							
								
								Move scrubber cache-related functions to Pleroma.HTML  
							
							 
							
							
							
						 
						
							2018-12-31 08:19:48 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								535fddd286 
								
							 
						 
						
							
							
								
								Friendship ended with Postgresql now Cachex is my best friend  
							
							 
							
							
							
						 
						
							2018-12-30 19:33:36 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								d9f40b05b3 
								
							 
						 
						
							
							
								
								Added get_stripped_html_for_object. Renamed a few things  
							
							 
							
							
							
						 
						
							2018-12-30 16:51:16 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								19f9889fbe 
								
							 
						 
						
							
							
								
								I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD  
							
							 
							
							
							
						 
						
							2018-12-29 17:45:50 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							 
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								005b4194ff 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/trans_fix_url_videos' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix "url" of Videos in transmogrifier
Closes  #367 
See merge request pleroma/pleroma!459  
							
						 
						
							2018-12-23 14:46:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								34a4ed22c4 
								
							 
						 
						
							
							
								
								twitter api: add "Video" to supported activity types list  
							
							 
							
							
							
						 
						
							2018-12-23 14:00:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f58f20abbb 
								
							 
						 
						
							
							
								
								Twitter ActivityView: fix crash when activity content is nil  
							
							 
							
							
							
						 
						
							2018-12-18 15:34:27 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								92a5133c42 
								
							 
						 
						
							
							
								
								fix text field  
							
							 
							
							
							
						 
						
							2018-12-17 22:53:16 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								cc6689cc20 
								
							 
						 
						
							
							
								
								Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'  
							
							 
							
							... 
							
							
							
							TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547  
							
						 
						
							2018-12-15 15:23:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								84b9a9d497 
								
							 
						 
						
							
							
								
								TwitterAPI.ActivityView: Ignore unhandled activities  
							
							 
							
							
							
						 
						
							2018-12-14 18:09:59 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								baead4ea4b 
								
							 
						 
						
							
							
								
								fix markdown formatting  
							
							 
							
							
							
						 
						
							2018-12-14 16:03:58 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								61ad2ce422 
								
							 
						 
						
							
							
								
								TwitterAPI: Include favorited post in json  
							
							 
							
							
							
						 
						
							2018-12-14 08:24:18 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								02288b5f1c 
								
							 
						 
						
							
							
								
								twitterapi: fix bad rebase  
							
							 
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3b8e5bcbeb 
								
							 
						 
						
							
							
								
								fix most tests  
							
							 
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								95a458f392 
								
							 
						 
						
							
							
								
								twitterapi: more object normalization work  
							
							 
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c7d4ff271 
								
							 
						 
						
							
							
								
								Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo  
							
							 
							
							
							
						 
						
							2018-11-01 15:07:27 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								24ba08de13 
								
							 
						 
						
							
							
								
								twitter api: add support for rendering Page objects  
							
							 
							
							
							
						 
						
							2018-11-01 10:01:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1ed25c963a 
								
							 
						 
						
							
							
								
								twitterapi: activity view: add the other in_reply_to fields  
							
							 
							
							
							
						 
						
							2018-10-25 04:04:04 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								fee43ae5e7 
								
							 
						 
						
							
							
								
								twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper  
							
							 
							
							
							
						 
						
							2018-10-25 02:59:04 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2f5b026548 
								
							 
						 
						
							
							
								
								twitter api: add support for user-specified html policy  
							
							 
							
							
							
						 
						
							2018-09-22 02:53:01 +00:00