floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								19a27ff006 
								
							 
						 
						
							
							
								
								allow small/center tags in misskeymarkdown ( #132 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/132  
							
						 
						
							2022-08-01 12:46:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								ff6c8455fb 
								
							 
						 
						
							
							
								
								[ #58 ] ensure all users are linked in MFM content ( #61 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/61  
							
						 
						
							2022-07-11 11:48:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								5ad256f170 
								
							 
						 
						
							
							
								
								[ #58 ] pre-link MFM content ( #59 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/59  
							
						 
						
							2022-07-10 17:06:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f2134e605b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-base-url  
							
							
							
						 
						
							2021-05-31 16:49:46 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								51a9f97e87 
								
							 
						 
						
							
							
								
								Deprecate Pleroma.Web.base_url/0  
							
							... 
							
							
							
							Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles. 
							
						 
						
							2021-05-31 16:48:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								52fc59f125 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into earmark  
							
							
							
						 
						
							2021-04-30 13:17:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6727a3659f 
								
							 
						 
						
							
							
								
								Remove Pleroma.Formatter.minify/2  
							
							
							
						 
						
							2021-04-30 12:27:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f 
								
							 
						 
						
							
							
								
								Bump Copyright to 2021  
							
							... 
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;' 
							
						 
						
							2021-01-13 07:49:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6520599b7d 
								
							 
						 
						
							
							
								
								Update Earmark to 1.4.13, use the new compact_output mode  
							
							
							
						 
						
							2020-12-11 17:23:03 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								f8c93246d6 
								
							 
						 
						
							
							
								
								Refactor Earmark code, fix tests  
							
							
							
						 
						
							2020-12-11 17:22:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								ba71bbf610 
								
							 
						 
						
							
							
								
								Improve Formatter.minify/2  
							
							
							
						 
						
							2020-12-11 17:22:24 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								e9e17e5df3 
								
							 
						 
						
							
							
								
								Upgrade Earmark to v1.4.10  
							
							
							
						 
						
							2020-12-11 17:22:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5b1eeb06d8 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2784  
							
						 
						
							2020-07-21 22:18:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								696c13ce54 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'linkify' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2677  
							
						 
						
							2020-07-21 22:17:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8daacc9114 
								
							 
						 
						
							
							
								
								AutoLinker --> Linkify, update to latest version  
							
							... 
							
							
							
							https://git.pleroma.social/pleroma/elixir-libraries/linkify  
						
							2020-06-30 16:39:15 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								369c03834c 
								
							 
						 
						
							
							
								
								formatter: Use user.uri instead of user.source_data.uri  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d067eaa7b3 
								
							 
						 
						
							
							
								
								formatter.ex: Use Phoenix.HTML for mention/hashtag generation  
							
							... 
							
							
							
							Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason. 
							
						 
						
							2020-04-08 22:58:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07  
							
							... 
							
							
							
							Done via the following command:
git diff fcd5dd259a 
							
						 
						
							2020-03-02 06:08:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3909b5b7b3 
								
							 
						 
						
							
							
								
								Remove AutoLinker scheme option from the config  
							
							
							
						 
						
							2020-02-05 21:13:56 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								10ff01acd9 
								
							 
						 
						
							
							
								
								[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.  
							
							
							
						 
						
							2019-10-16 21:59:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								1a858134ed 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1218  
							
							
							
						 
						
							2019-09-25 12:24:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								95c948110c 
								
							 
						 
						
							
							
								
								Add rel="ugc" to hashtags and mentions  
							
							
							
						 
						
							2019-09-19 14:56:10 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d8098d142a 
								
							 
						 
						
							
							
								
								added Emoji.Formatter  
							
							
							
						 
						
							2019-08-30 22:04:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d7808b5db4 
								
							 
						 
						
							
							
								
								added  code\path fields without html tags  in ets  
							
							
							
						 
						
							2019-08-30 07:30:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								bbea5691da 
								
							 
						 
						
							
							
								
								Mention all people in the beginning of DM  
							
							
							
						 
						
							2019-05-24 20:34:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								9134848170 
								
							 
						 
						
							
							
								
								Do not truncate DM when it contains newlines and safe_dm_mentions is set to true  
							
							
							
						 
						
							2019-05-22 04:04:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f76a40d02 
								
							 
						 
						
							
							
								
								formatter.ex: Add get_emoji_map/1  
							
							
							
						 
						
							2019-05-03 16:27:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								85b5c60694 
								
							 
						 
						
							
							
								
								Pleroma.Formatter: width/height to class=emoji  
							
							
							
						 
						
							2019-05-03 16:25:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								f9af90c5aa 
								
							 
						 
						
							
							
								
								Revert "simplify mentions escape"  
							
							... 
							
							
							
							This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1. 
							
						 
						
							2019-04-12 19:25:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								3601f03147 
								
							 
						 
						
							
							
								
								Adding tag to emoji ets table  
							
							... 
							
							
							
							changes in apis 
							
						 
						
							2019-04-01 17:17:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8468f3f6d4 
								
							 
						 
						
							
							
								
								Add safe dm mode option.  
							
							
							
						 
						
							2019-03-20 21:09:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c42d34b2ec 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.MaxLineLength  
							
							
							
						 
						
							2019-03-13 04:26:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5d961d536c 
								
							 
						 
						
							
							
								
								fix formatter  
							
							
							
						 
						
							2019-02-27 15:40:30 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								c3ac9424d2 
								
							 
						 
						
							
							
								
								AutoLinker  
							
							
							
						 
						
							2019-02-26 23:32:26 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c9b418e547 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'oembed_provider'  
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/activity.ex 
							
						 
						
							2019-01-25 05:00:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								74346a7035 
								
							 
						 
						
							
							
								
								Fix merge conflict  
							
							
							
						 
						
							2019-01-18 18:31:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								997f4a5e09 
								
							 
						 
						
							
							
								
								Remove custom emojis and trailing whitespaces from previews  
							
							
							
						 
						
							2019-01-18 10:28:19 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2bfae25a1f 
								
							 
						 
						
							
							
								
								[ #491 ] Made user bio preserve full nicknames (nick@host).  
							
							
							
						 
						
							2019-01-17 18:03:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								461ab9489d 
								
							 
						 
						
							
							
								
								formatter: improve microformats markup  
							
							
							
						 
						
							2019-01-16 03:54:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9aa69e12b8 
								
							 
						 
						
							
							
								
								Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate  
							
							
							
						 
						
							2019-01-15 23:25:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e4dc3f71ae 
								
							 
						 
						
							
							
								
								Resolve merge conflict  
							
							
							
						 
						
							2019-01-13 13:38:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								980b5288ed 
								
							 
						 
						
							
							
								
								update copyright years to 2019  
							
							
							
						 
						
							2018-12-31 15:41:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								f1b93b5be7 
								
							 
						 
						
							
							
								
								[ #413 ] fix parse mentions  
							
							
							
						 
						
							2018-12-20 09:35:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									raeno 
								
							 
						 
						
							
							
							
							
								
							
							
								7fb3780431 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into oembed_provider  
							
							
							
						 
						
							2018-12-19 22:39:44 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								059dd6f681 
								
							 
						 
						
							
							
								
								Ignore HTML characters in formatter.ex  
							
							
							
						 
						
							2018-12-18 21:38:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									raeno 
								
							 
						 
						
							
							
							
							
								
							
							
								a300336459 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into oembed_provider  
							
							
							
						 
						
							2018-12-18 14:59:32 +01:00