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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2de208817c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into rename/pleroma_activity_consistency  
							
							
							
						 
						
							2019-01-23 13:05:58 +01: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 
								
							 
						 
						
							
							
							
							
								
							
							
								9adc80afff 
								
							 
						 
						
							
							
								
								common api: set directMessage flag on our own posts  
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								651ce1c97b 
								
							 
						 
						
							
							
								
								Merge branch '491_full_mentions_in_user_bio' into 'develop'  
							
							... 
							
							
							
							[#491 ] Made user bio preserve full nicknames (nick@host)
Closes  #491 
See merge request pleroma/pleroma!676  
							
						 
						
							2019-01-19 07:36:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								65bb9b2fba 
								
							 
						 
						
							
							
								
								[ #491 ] Made full nicknames be preserved in user links text only in Bio.  
							
							
							
						 
						
							2019-01-18 09:30:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								849c83ed46 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2019-01-17 16:10:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6bc9a641ba 
								
							 
						 
						
							
							
								
								Default to disabled in the code in case the setting is absent from config.exs  
							
							
							
						 
						
							2019-01-17 16:01:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8c368d42a2 
								
							 
						 
						
							
							
								
								Make attachment links configurable  
							
							... 
							
							
							
							Thanks @href! 
							
						 
						
							2019-01-17 15:48:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								b594a54d0c 
								
							 
						 
						
							
							
								
								unpin when deleting a status  
							
							
							
						 
						
							2019-01-11 12:31:31 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								ab4c5f5bf7 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'  
							
							... 
							
							
							
							common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651  
							
						 
						
							2019-01-10 03:54:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0bdbd4f968 
								
							 
						 
						
							
							
								
								common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown  
							
							... 
							
							
							
							ok @lanodan 
							
						 
						
							2019-01-10 03:45:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2ecf81f10c 
								
							 
						 
						
							
							
								
								common api: fix newlines in markdown code blocks  
							
							
							
						 
						
							2019-01-10 03:37:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1b06e6fdf3 
								
							 
						 
						
							
							
								
								only non-reblogs, self-authored, public statuses can be pinned  
							
							
							
						 
						
							2019-01-09 17:40:15 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								380e9fba21 
								
							 
						 
						
							
							
								
								add pinned posts  
							
							
							
						 
						
							2019-01-07 20:45:33 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								3c86d907d4 
								
							 
						 
						
							
							
								
								add some brakets to the emoji list.  
							
							
							
						 
						
							2019-01-05 17:35:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								0787f0dfbe 
								
							 
						 
						
							
							
								
								Strip HTML in and allow emoji in summaries.  
							
							
							
						 
						
							2019-01-05 17:28:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								980b5288ed 
								
							 
						 
						
							
							
								
								update copyright years to 2019  
							
							
							
						 
						
							2018-12-31 15:41:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								be70272ab0 
								
							 
						 
						
							
							
								
								Treat only true and "true" as true  
							
							
							
						 
						
							2018-12-27 13:21:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								838c024231 
								
							 
						 
						
							
							
								
								Treat any present value in "no_attachment_links" as true  
							
							
							
						 
						
							2018-12-27 02:39:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								baead4ea4b 
								
							 
						 
						
							
							
								
								fix markdown formatting  
							
							
							
						 
						
							2018-12-14 16:03:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								1ca080c862 
								
							 
						 
						
							
							
								
								Prevent accidental double RTs or favorites  
							
							
							
						 
						
							2018-12-14 07:56:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								89b3729afa 
								
							 
						 
						
							
							
								
								fix warnings  
							
							
							
						 
						
							2018-12-12 09:09:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								074fa790ba 
								
							 
						 
						
							
							
								
								fix compile warnings  
							
							
							
						 
						
							2018-12-09 20:50:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0896cf4c0f 
								
							 
						 
						
							
							
								
								Fix most mastodon api bugs.  
							
							
							
						 
						
							2018-11-20 20:12:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6f0b9a5163 
								
							 
						 
						
							
							
								
								Fix Notification tests.  
							
							
							
						 
						
							2018-11-20 19:15:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4e93d6ae14 
								
							 
						 
						
							
							
								
								common api: utils: flip to/cc for mentions  
							
							
							
						 
						
							2018-11-08 19:17:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5bb88fd174 
								
							 
						 
						
							
							
								
								Runtime configuration  
							
							... 
							
							
							
							Related to #85 
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro. 
							
						 
						
							2018-11-06 19:41:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								45ebc8dd9a 
								
							 
						 
						
							
							
								
								Check for empty string in_reply_to ids.  
							
							
							
						 
						
							2018-11-02 17:33:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2bf358d7b4 
								
							 
						 
						
							
							
								
								activitypub: use Object.delete() instead of mutating the database and cache directly  
							
							
							
						 
						
							2018-11-01 07:29:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								558e6a84d6 
								
							 
						 
						
							
							
								
								[Pleroma.Web.CommonAPI]: Delete post cache entry when it’s deleted  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/346  
							
						 
						
							2018-11-01 06:52:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								47f76bf4b1 
								
							 
						 
						
							
							
								
								common api: allow self-liking objects  
							
							... 
							
							
							
							mastodon allows this, for whatever reason.
closes  #347 . 
							
						 
						
							2018-10-31 22:29:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f407831120 
								
							 
						 
						
							
							
								
								common api: prefer formatting attachments using the attachment's name instead of URI  
							
							
							
						 
						
							2018-10-29 17:59:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								784b3a615d 
								
							 
						 
						
							
							
								
								utils: fix another possible leak with private S3 backends using mediaproxy  
							
							... 
							
							
							
							same rationale as the other mediaproxy changes 
							
						 
						
							2018-10-29 17:26:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								30efa86c05 
								
							 
						 
						
							
							
								
								common api: enable tag linking in markdown mode  
							
							
							
						 
						
							2018-10-14 20:36:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								111841ad34 
								
							 
						 
						
							
							
								
								common api: take the combination of the subject and content for length limit enforcement  
							
							... 
							
							
							
							closes  #315  
						
							2018-10-10 07:53:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								285ac80c36 
								
							 
						 
						
							
							
								
								config: allow for accepted post formats to be configured  
							
							
							
						 
						
							2018-10-05 21:02:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b1be9415ef 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-a26d5e6b' into 'develop'"  
							
							... 
							
							
							
							This reverts commit d31bbb1cfe340ab3cb90 
							
						 
						
							2018-10-05 20:49:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								58539e1357 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/rich-text' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !309  
							
						 
						
							2018-08-31 09:51:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6aa65b68b8 
								
							 
						 
						
							
							
								
								common api: add support for formatting messages outside of twitter-style plain text  
							
							
							
						 
						
							2018-08-31 03:13:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								63094cfd3e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/emoji-in-local-users' into 'develop'  
							
							... 
							
							
							
							Add emoji to local user profiles.
Closes  #202 
See merge request pleroma/pleroma!271  
							
						 
						
							2018-08-26 23:24:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								741c6ad671 
								
							 
						 
						
							
							
								
								common api: handle replying to orphaned threads  
							
							
							
						 
						
							2018-08-26 22:37:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ensra 
								
							 
						 
						
							
							
							
							
								
							
							
								1495d04789 
								
							 
						 
						
							
							
								
								fix test for converting bio \r\n to <br>.  
							
							
							
						 
						
							2018-08-21 14:51:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c033d2004b 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2018-08-20 18:40:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								145546e52a 
								
							 
						 
						
							
							
								
								common api: format hashtags in the same way as we format mentions  
							
							
							
						 
						
							2018-08-20 18:39:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								92caa2632b 
								
							 
						 
						
							
							
								
								Use Image type for emoji icons.  
							
							
							
						 
						
							2018-08-13 16:21:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								f9d13558c8 
								
							 
						 
						
							
							
								
								CommonAPI: add emoji to user source data on update  
							
							
							
						 
						
							2018-08-13 15:27:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								49da04c509 
								
							 
						 
						
							
							
								
								common api: use Object.normalize() instead of Object.get_by_ap_id() directly.  
							
							
							
						 
						
							2018-06-27 13:07:35 +00:00