floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								d55de5debf 
								
							 
						 
						
							
							
								
								Remerge of hashtag following ( #341 )  
							
							... 
							
							
							
							this time with less idiot
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/341  
							
						 
						
							2022-12-05 12:58:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								ec6bf8c3f7 
								
							 
						 
						
							
							
								
								revert  4a94c9a31e 
							
							... 
							
							
							
							revert Add ability to follow hashtags (#336 )
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/336  
							
						 
						
							2022-12-04 20:04:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								4a94c9a31e 
								
							 
						 
						
							
							
								
								Add ability to follow hashtags ( #336 )  
							
							... 
							
							
							
							Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/336  
							
						 
						
							2022-12-04 17:36:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								0cfd5b4e89 
								
							 
						 
						
							
							
								
								Add ability to set a default post expiry ( #321 )  
							
							... 
							
							
							
							Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/321  
							
						 
						
							2022-11-28 13:34:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								cc6a076202 
								
							 
						 
						
							
							
								
								Include requested_by in relationship ( #260 )  
							
							... 
							
							
							
							Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/260  
							
						 
						
							2022-11-10 03:16:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								4e8ab0deeb 
								
							 
						 
						
							
							
								
								fix count of poll voters  
							
							
							
						 
						
							2022-11-08 13:50:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								479aacb1b6 
								
							 
						 
						
							
							
								
								Add fallback for reports that don't have attached activities  
							
							
							
						 
						
							2022-11-08 11:01:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								b7e8ce2350 
								
							 
						 
						
							
							
								
								Scrape instance nodeinfo ( #251 )  
							
							... 
							
							
							
							Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/251  
							
						 
						
							2022-11-06 22:49:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Norm 
								
							 
						 
						
							
							
							
							
								
							
							
								a6d85003fe 
								
							 
						 
						
							
							
								
								Remote interaction with posts ( #198 )  
							
							... 
							
							
							
							Grabbed from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3587 
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/198 
Co-authored-by: Norm <normandy@biribiri.dev>
Co-committed-by: Norm <normandy@biribiri.dev> 
							
						 
						
							2022-09-08 10:19:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								1b826eea54 
								
							 
						 
						
							
							
								
								Allow reacting with remote emoji when they exist on the post ( #200 )  
							
							... 
							
							
							
							Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/200  
							
						 
						
							2022-09-04 23:31:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								df39cab9c1 
								
							 
						 
						
							
							
								
								Automatic status translation ( #187 )  
							
							... 
							
							
							
							Fixes  #115 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/187  
						
							2022-08-29 19:42:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								e4f2251e0f 
								
							 
						 
						
							
							
								
								Add support for setting language in instance metadata ( #183 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/183  
							
						 
						
							2022-08-25 16:11:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								d72f9e39d9 
								
							 
						 
						
							
							
								
								add visibility check on quote ( #178 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/178  
							
						 
						
							2022-08-21 15:17:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								11ec9daa5b 
								
							 
						 
						
							
							
								
								API compatibility with fedibird, frontend config ( #163 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/163  
							
						 
						
							2022-08-17 00:22:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hélène 
								
							 
						 
						
							
							
							
							
								
							
							
								b3e4d81362 
								
							 
						 
						
							
							
								
								StatusView: implement pleroma.context field  
							
							... 
							
							
							
							This field replaces the now deprecated conversation_id field, and now
exposes the ActivityPub object `context` directly via the MastoAPI
instead of relying on StatusNet-era data concepts. 
							
						 
						
							2022-08-07 20:48:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hélène 
								
							 
						 
						
							
							
							
							
								
							
							
								b9bb093600 
								
							 
						 
						
							
							
								
								StatusView: clear MSB on calculated conversation_id  
							
							... 
							
							
							
							This field seems to be a left-over from the StatusNet era.
If your application uses `pleroma.conversation_id`: this field is
deprecated.
It is currently stubbed instead by doing a CRC32 of the context, and
clearing the MSB to avoid overflow exceptions with signed integers on
the different clients using this field (Java/Kotlin code, mostly; see
Husky and probably other mobile clients.)
This should be removed in a future version of Pleroma. Pleroma-FE
currently depends on this field, as well. 
							
						 
						
							2022-08-07 20:47:59 +01: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 
								
							 
						 
						
							
							
							
							
								
							
							
								1419eee5df 
								
							 
						 
						
							
							
								
								Quote posting ( #113 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/113  
							
						 
						
							2022-07-25 16:30:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								0f132b802d 
								
							 
						 
						
							
							
								
								purge chat and shout endpoints  
							
							
							
						 
						
							2022-07-21 11:29:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								3b8bf8464f 
								
							 
						 
						
							
							
								
								update features array  
							
							
							
						 
						
							2022-07-20 15:43:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								54ed8760ff 
								
							 
						 
						
							
							
								
								Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' ( #85 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/85  
							
						 
						
							2022-07-18 13:08:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								064c36274c 
								
							 
						 
						
							
							
								
								Purge gopher frontend  
							
							
							
						 
						
							2022-06-27 17:31:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sn0w 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f2f8b81fc4 
								
							 
						 
						
							
							
								
								Use mediaproxy for emoji notifications if enabled  
							
							
							
						 
						
							2022-06-17 14:27:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								0627da0027 
								
							 
						 
						
							
							
								
								mix format  
							
							
							
						 
						
							2022-06-14 16:25:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								3f06ccc9e3 
								
							 
						 
						
							
							
								
								allow source from misskey  
							
							
							
						 
						
							2022-06-14 10:56:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								0f5bea2465 
								
							 
						 
						
							
							
								
								Add emoji_url to notifications to allow rendering  
							
							... 
							
							
							
							Ref #5  
							
						 
						
							2022-06-12 13:35:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								ed58a6b070 
								
							 
						 
						
							
							
								
								run mix format  
							
							
							
						 
						
							2022-06-10 13:41:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								801f2b0fc5 
								
							 
						 
						
							
							
								
								Add capabilities for emoji reactions  
							
							... 
							
							
							
							Patch from helene@p.helene.moe  
							
						 
						
							2022-06-09 12:56:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								0f2bfeaea7 
								
							 
						 
						
							
							
								
								Enable mediaproxy by default  
							
							
							
						 
						
							2022-06-08 17:19:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								ad0b8c095c 
								
							 
						 
						
							
							
								
								add custom emoji reaction support  
							
							
							
						 
						
							2022-06-08 02:42:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								1c223331fc 
								
							 
						 
						
							
							
								
								API: show info about privileged staff in instance metadata  
							
							
							
						 
						
							2021-12-27 02:28:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								de006443f0 
								
							 
						 
						
							
							
								
								MastoAPI: Profile directory  
							
							
							
						 
						
							2021-12-26 02:35:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								73609211a4 
								
							 
						 
						
							
							
								
								Merge branch 'account-notes' into 'develop'  
							
							... 
							
							
							
							MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540  
							
						 
						
							2021-12-25 01:41:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								b96a58ff28 
								
							 
						 
						
							
							
								
								Merge branch 'account-subscriptions' into 'develop'  
							
							... 
							
							
							
							MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555  
							
						 
						
							2021-12-25 01:34:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								50892a198d 
								
							 
						 
						
							
							
								
								Merge branch 'mkljczk-develop-patch-64464' into 'develop'  
							
							... 
							
							
							
							Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523  
							
						 
						
							2021-12-19 18:51:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								bd853199d9 
								
							 
						 
						
							
							
								
								Merge branch 'v2-suggestions' into 'develop'  
							
							... 
							
							
							
							V2 suggestions
See merge request pleroma/pleroma!3547  
							
						 
						
							2021-12-19 17:31:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								c96e52b88c 
								
							 
						 
						
							
							
								
								Add 'notifying' to relationship for compatibility with Mastodon  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-06 21:24:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6519f59d91 
								
							 
						 
						
							
							
								
								v2 Suggestions: return is_suggested through the API  
							
							
							
						 
						
							2021-11-26 23:10:01 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8dc1d2201a 
								
							 
						 
						
							
							
								
								Instance: add v2_suggestions feature  
							
							
							
						 
						
							2021-11-26 22:45:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b17360cd7c 
								
							 
						 
						
							
							
								
								v2 Suggestions: rudimentary API response  
							
							
							
						 
						
							2021-11-26 14:34:10 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								40414bf177 
								
							 
						 
						
							
							
								
								MastoAPI: Add user notes on accounts  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-11-21 16:56:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								555d7d57c9 
								
							 
						 
						
							
							
								
								Add "exposable_reactions" to features, if showing reactions  
							
							
							
						 
						
							2021-09-09 18:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								01175ef498 
								
							 
						 
						
							
							
								
								Streamer: fix crash in MastodonAPI.StatusView  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508  
							
						 
						
							2021-08-13 17:58:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								61ba54897e 
								
							 
						 
						
							
							
								
								Merge branch 'streamer-crash-fix' into 'develop'  
							
							... 
							
							
							
							Streamer crash fix
See merge request pleroma/pleroma!3508  
							
						 
						
							2021-08-13 15:42:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b7bbf42acd 
								
							 
						 
						
							
							
								
								Streamer: fix crash in MastodonAPI.StatusView  
							
							
							
						 
						
							2021-08-13 10:25:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								901204df22 
								
							 
						 
						
							
							
								
								Merge branch 'poll-notification' into 'develop'  
							
							... 
							
							
							
							MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484  
							
						 
						
							2021-08-09 10:02:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ad09bdb376 
								
							 
						 
						
							
							
								
								Improve readability  
							
							
							
						 
						
							2021-08-06 07:59:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4028c908c 
								
							 
						 
						
							
							
								
								Add key- and valuePlaceholders for quarantined_instances and mrf_simple  
							
							... 
							
							
							
							* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility) 
							
						 
						
							2021-08-06 07:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								03030b47c2 
								
							 
						 
						
							
							
								
								quarantine instances info  
							
							... 
							
							
							
							Added a new field in the nodeinfo called quarantined_instances_info
This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}` 
							
						 
						
							2021-08-06 07:59:53 +02:00