floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								2641dcdd15 
								
							 
						 
						
							
							
								
								Post editing ( #202 )  
							
							... 
							
							
							
							Rebased from #103 
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/202  
							
						 
						
							2022-09-06 19:24:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								e9f1897cfd 
								
							 
						 
						
							
							
								
								parser MFM server-side ( #172 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/172  
							
						 
						
							2022-08-18 03:14:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								62e179f446 
								
							 
						 
						
							
							
								
								make conversation-id deterministic ( #154 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/154  
							
						 
						
							2022-08-06 20:59:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								5ad256f170 
								
							 
						 
						
							
							
								
								[ #58 ] pre-link MFM content ( #59 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/59  
							
						 
						
							2022-07-10 17:06:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								4fb2251221 
								
							 
						 
						
							
							
								
								Allow authoring MFM  
							
							
							
						 
						
							2022-06-14 15:56:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								773708cfe8 
								
							 
						 
						
							
							
								
								Merge branch 'builder-note' into 'develop'  
							
							... 
							
							
							
							CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1
See merge request pleroma/pleroma!3511  
							
						 
						
							2021-08-14 18:32:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a2eacfc525 
								
							 
						 
						
							
							
								
								CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1  
							
							
							
						 
						
							2021-08-14 11:01:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								436fac3bac 
								
							 
						 
						
							
							
								
								maybe_notify_subscribers: Don't create notifications from ingested messages  
							
							
							
						 
						
							2021-08-11 20:49:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								b99f60615c 
								
							 
						 
						
							
							
								
								Fix order of Pleroma.Web.Utils.Params aliases  
							
							
							
						 
						
							2021-06-08 12:50:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								ec65b7ae29 
								
							 
						 
						
							
							
								
								Pleroma.Web.Params --> Pleroma.Web.Utils.Params  
							
							
							
						 
						
							2021-06-08 12:50:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								0877b120c3 
								
							 
						 
						
							
							
								
								Pleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1  
							
							... 
							
							
							
							Breaks cycle in lib/pleroma/web/api_spec/operations/status_operation.ex 
							
						 
						
							2021-06-08 12:50:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c435de426d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-constants  
							
							
							
						 
						
							2021-06-01 11:33:11 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								10dfe81479 
								
							 
						 
						
							
							
								
								Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0  
							
							... 
							
							
							
							Move as_local_public/0 to stop making modules depend on Web at compile-time 
							
						 
						
							2021-05-31 13:39:15 -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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3bc7d12271 
								
							 
						 
						
							
							
								
								Remove sensitive-property setting #nsfw, create HashtagPolicy  
							
							
							
						 
						
							2021-02-27 21:26:17 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1e7e4d379 
								
							 
						 
						
							
							
								
								Object: Rework how Object.normalize works  
							
							... 
							
							
							
							Now it defaults to not fetching, and the option is named. 
							
						 
						
							2021-01-04 13:38:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								3966add048 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'features/hashtag-column' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2824  
							
						 
						
							2020-12-28 12:02:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								acb03d591b 
								
							 
						 
						
							
							
								
								Insert text representation of hashtags into object["hashtags"]  
							
							... 
							
							
							
							Includes a new mix task: pleroma.database fill_old_hashtags 
							
						 
						
							2020-12-22 05:15:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								f8c93246d6 
								
							 
						 
						
							
							
								
								Refactor Earmark code, fix tests  
							
							
							
						 
						
							2020-12-11 17:22:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								e9e17e5df3 
								
							 
						 
						
							
							
								
								Upgrade Earmark to v1.4.10  
							
							
							
						 
						
							2020-12-11 17:22:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af3f00292c 
								
							 
						 
						
							
							
								
								Fix formatting  
							
							
							
						 
						
							2020-11-11 19:12:46 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0118ccb53c 
								
							 
						 
						
							
							
								
								Add local visibility  
							
							
							
						 
						
							2020-11-11 18:54:01 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								1bfd8528bb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/local-only-scope'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2020-10-27 18:59:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2a475622ee 
								
							 
						 
						
							
							
								
								Add Pleroma.Constants.as_local_public/0  
							
							
							
						 
						
							2020-10-15 19:07:00 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f79bbbc31 
								
							 
						 
						
							
							
								
								Add local-only statuses  
							
							
							
						 
						
							2020-10-15 18:37:44 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								64553ebae2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into chore/elixir-1.11  
							
							
							
						 
						
							2020-10-13 09:54:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9f4fe5485b 
								
							 
						 
						
							
							
								
								alias alphabetically order  
							
							
							
						 
						
							2020-10-13 16:43:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c497558d43 
								
							 
						 
						
							
							
								
								AuthenticationPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								636c00037d 
								
							 
						 
						
							
							
								
								Fix duplicate @doc entries  
							
							
							
						 
						
							2020-10-07 09:58:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								82895a4012 
								
							 
						 
						
							
							
								
								SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert  
							
							
							
						 
						
							2020-07-15 11:40:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d23804f191 
								
							 
						 
						
							
							
								
								Use the Pleroma.Config alias  
							
							
							
						 
						
							2020-07-09 10:53:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ee35bb5ac2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-25 13:57:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7bc2ec0aa2 
								
							 
						 
						
							
							
								
								Merge branch 'mastodon-migration-compat' into 'develop'  
							
							... 
							
							
							
							Add compatibility routes for converted mastodon instances
Closes  #1797 
See merge request pleroma/pleroma!2572  
							
						 
						
							2020-05-24 19:05:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5d60b25e69 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/common_api/utils.ex  
							
							
							
						 
						
							2020-05-22 15:44:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cc82229ba7 
								
							 
						 
						
							
							
								
								Add filename_display_max_length config  
							
							
							
						 
						
							2020-05-22 18:19:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								355aa3bdc7 
								
							 
						 
						
							
							
								
								ActivityPubController: Add Mastodon activity compat route.  
							
							
							
						 
						
							2020-05-22 17:06:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								eb5f428565 
								
							 
						 
						
							
							
								
								CommonAPI: Change public->private implicit addressing.  
							
							... 
							
							
							
							This will not add the OP to the `to` field anymore when going from
public to private. 
							
						 
						
							2020-05-20 13:38:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3cff4e24cd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-13 12:44:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7803a85d2c 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for StatusController  
							
							
							
						 
						
							2020-05-13 00:25:21 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fb2d284d28 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-07 15:05:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								3d0c567fbc 
								
							 
						 
						
							
							
								
								Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController  
							
							
							
						 
						
							2020-05-07 08:14:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c40afe5ba0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-04 10:43:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6aa116eca7 
								
							 
						 
						
							
							
								
								Create activity handling: Flip it and reverse it  
							
							... 
							
							
							
							Both objects and create activities will now go through the common
pipeline and will be validated. Objects are now created as a side
effect of the Create activity, rolling back a transaction if it's
not possible to insert the object. 
							
						 
						
							2020-04-28 16:26:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								560f2c1979 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for ReportController  
							
							
							
						 
						
							2020-04-28 16:50:37 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7d38197894 
								
							 
						 
						
							
							
								
								CommonAPI: Don't make repeating announces possible  
							
							
							
						 
						
							2020-04-23 13:33:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9172d719cc 
								
							 
						 
						
							
							
								
								profile emojis in User.emoji instead of source_data  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1379c4de8 
								
							 
						 
						
							
							
								
								Formatting: Do not use \n and prefer <br> instead  
							
							... 
							
							
							
							It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375  
							
						 
						
							2020-03-13 16:07:17 +01:00