FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								32fbd2e4e3 
								
							 
						 
						
							
							
								
								fix all tests  
							
							
							
						 
						
							2022-06-11 16:14:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								71f4281850 
								
							 
						 
						
							
							
								
								fix quoting of custom emoji  
							
							... 
							
							
							
							Fixes  #3  
						
							2022-06-11 14:08:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								ed58a6b070 
								
							 
						 
						
							
							
								
								run mix format  
							
							
							
						 
						
							2022-06-10 13:41:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								e910f21d8d 
								
							 
						 
						
							
							
								
								allow undoing  
							
							
							
						 
						
							2022-06-08 13:27:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								e724da2a42 
								
							 
						 
						
							
							
								
								remove io.inspects  
							
							
							
						 
						
							2022-06-08 12:58:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								ad0b8c095c 
								
							 
						 
						
							
							
								
								add custom emoji reaction support  
							
							
							
						 
						
							2022-06-08 02:42:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tusooa Zhu 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d41ccc47b 
								
							 
						 
						
							
							
								
								Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2  
							
							... 
							
							
							
							Mastodon uses the Reject activity also for the purpose of removing
a follower, in addition to reject a follow request. We should
also update the original Follow activity in this case. 
							
						 
						
							2021-12-17 14:17:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c435de426d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-constants  
							
							
							
						 
						
							2021-06-01 11:33:11 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								0ddf492c5d 
								
							 
						 
						
							
							
								
								Merge branch 'cycles-base-url' into 'develop'  
							
							... 
							
							
							
							Deprecate Pleroma.Web.base_url/0
See merge request pleroma/pleroma!3432  
							
						 
						
							2021-06-01 16:15:27 +00: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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								53193b84b1 
								
							 
						 
						
							
							
								
								utils: Fix maybe_splice_recipient when "object" isn’t a map  
							
							
							
						 
						
							2021-04-05 19:19:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1205406d9 
								
							 
						 
						
							
							
								
								ActivityPubControllerTest: Apply same addr changes to object  
							
							
							
						 
						
							2021-04-05 19:19:12 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8a8c154b4e 
								
							 
						 
						
							
							
								
								test fixes  
							
							
							
						 
						
							2020-11-19 09:58:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								be0b874e1d 
								
							 
						 
						
							
							
								
								fix for mastodon forwarded reports  
							
							
							
						 
						
							2020-11-19 09:53:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0118ccb53c 
								
							 
						 
						
							
							
								
								Add local visibility  
							
							
							
						 
						
							2020-11-11 18:54:01 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f79bbbc31 
								
							 
						 
						
							
							
								
								Add local-only statuses  
							
							
							
						 
						
							2020-10-15 18:37:44 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9ea51a6de5 
								
							 
						 
						
							
							
								
								[ #2791 ] AccountView: renamed :force option to :skip_visibility_check.  
							
							
							
						 
						
							2020-07-23 15:08:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6f5f7af607 
								
							 
						 
						
							
							
								
								[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.  
							
							... 
							
							
							
							Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting. 
							
						 
						
							2020-07-22 19:06:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b02df1803e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys  
							
							
							
						 
						
							2020-06-05 23:15:10 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								54bae06b4f 
								
							 
						 
						
							
							
								
								Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})  
							
							... 
							
							
							
							Unifies all the similar functions to one and simplify some blocks with it. 
							
						 
						
							2020-06-05 14:48:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								317e2b8d61 
								
							 
						 
						
							
							
								
								Use atoms as keys in ActivityPub.fetch_* functions options  
							
							
							
						 
						
							2020-06-04 21:36:26 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c16315d055 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for AdminAPI.ReportController  
							
							
							
						 
						
							2020-06-03 19:17:05 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d0ba1844b0 
								
							 
						 
						
							
							
								
								ActivityPub: Fix non-federating blocks.  
							
							
							
						 
						
							2020-05-12 10:52:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f0c22df226 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced  
							
							
							
						 
						
							2020-05-07 14:45:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								92caae5923 
								
							 
						 
						
							
							
								
								Undoing: Move undoing blocks to the pipeline everywhere.  
							
							
							
						 
						
							2020-05-05 18:02:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								64bb72f98a 
								
							 
						 
						
							
							
								
								Typo fix.  
							
							
							
						 
						
							2020-04-30 13:57:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b607ae1a1c 
								
							 
						 
						
							
							
								
								removing grouped reports admin api endpoint  
							
							
							
						 
						
							2020-03-30 13:51:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								981e015f1b 
								
							 
						 
						
							
							
								
								Mastodon API Account view: Remove an outdated hack  
							
							... 
							
							
							
							The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary. 
							
						 
						
							2020-03-22 17:10:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e87a32bcd7 
								
							 
						 
						
							
							
								
								rip out fetch_initial_posts  
							
							... 
							
							
							
							Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes  #1595  #1422  
							
						 
						
							2020-03-15 15:59:17 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								22018adae6 
								
							 
						 
						
							
							
								
								Fix Dialyzer warnings  
							
							
							
						 
						
							2020-02-25 18:34:56 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								1262357ddb 
								
							 
						 
						
							
							
								
								Merge branch 'cancel-follow-request' into 'develop'  
							
							... 
							
							
							
							Add support for cancellation of a follow request
Closes  #1522 
See merge request pleroma/pleroma!2175  
							
						 
						
							2020-02-07 16:10:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								8a79f20c21 
								
							 
						 
						
							
							
								
								EmojiReactions: Rename to EmojiReacts  
							
							
							
						 
						
							2020-02-06 18:09:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								8c71f7e11a 
								
							 
						 
						
							
							
								
								Add support for cancellation of a follow request  
							
							
							
						 
						
							2020-02-05 20:22:15 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								34fc0ca053 
								
							 
						 
						
							
							
								
								Emoji reactions: Add sanity checks for the cache  
							
							
							
						 
						
							2020-01-23 12:34:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								dd3fc50ea4 
								
							 
						 
						
							
							
								
								Emoji reactions: Change cache and reply format  
							
							
							
						 
						
							2020-01-22 13:57:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Citharel 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d2f1c4f658 
								
							 
						 
						
							
							
								
								Add ActivityPub Object Event type support  
							
							... 
							
							
							
							Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr> 
							
						 
						
							2019-12-17 16:16:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								3ecf131511 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/report-notes  
							
							
							
						 
						
							2019-12-12 02:16:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								4b60d41db9 
								
							 
						 
						
							
							
								
								Add report notes  
							
							
							
						 
						
							2019-12-04 00:26:37 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								fcabcab443 
								
							 
						 
						
							
							
								
								Fetch account from report, not from status (it might be deleted)  
							
							
							
						 
						
							2019-11-28 00:09:00 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								5135656f57 
								
							 
						 
						
							
							
								
								Handle reopened reports with deleted statuses  
							
							
							
						 
						
							2019-11-27 22:54:12 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								b62be2564c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-render-whole-status  
							
							
							
						 
						
							2019-11-26 00:25:43 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								b3b4e5ca80 
								
							 
						 
						
							
							
								
								AdminAPI: Grouped reports old/new fix  
							
							... 
							
							
							
							If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports) 
							
						 
						
							2019-11-26 00:20:46 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								1364d303f8 
								
							 
						 
						
							
							
								
								AdminAPI: Fix grouped reports for closed/resolved reports  
							
							
							
						 
						
							2019-11-26 00:13:11 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								2b341627da 
								
							 
						 
						
							
							
								
								Admin API: Render whole status in grouped reports  
							
							
							
						 
						
							2019-11-25 00:04:29 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								c506cc48ef 
								
							 
						 
						
							
							
								
								Admin API: Error when trying to update reports in the "old" format  
							
							
							
						 
						
							2019-11-16 18:44:48 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								1afeaf82fa 
								
							 
						 
						
							
							
								
								Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'  
							
							... 
							
							
							
							Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815  
							
						 
						
							2019-11-14 13:35:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b22ee9d966 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-11-08 13:27:11 +01:00