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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								7258db023e 
								
							 
						 
						
							
							
								
								Support old flag format  
							
							
							
						 
						
							2019-11-08 18:21:29 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								f171095960 
								
							 
						 
						
							
							
								
								Grouped reports with status data baked in  
							
							
							
						 
						
							2019-11-06 21:25:46 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								43ea16870f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/reports-groups-and-multiple-state-update  
							
							
							
						 
						
							2019-11-05 02:12:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								791bcfd90f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/store-statuses-data-inside-flag  
							
							
							
						 
						
							2019-10-27 16:11:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								8eff05d4c6 
								
							 
						 
						
							
							
								
								Strip status data from Flag (when federating or closing/resolving report)  
							
							
							
						 
						
							2019-10-27 16:05:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								b08b1d5d91 
								
							 
						 
						
							
							
								
								Store status data inside Flag activity  
							
							
							
						 
						
							2019-10-23 21:27:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								3f6a596922 
								
							 
						 
						
							
							
								
								activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors  
							
							
							
						 
						
							2019-10-22 20:50:46 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								ef659331b0 
								
							 
						 
						
							
							
								
								implement invisible support for remote users  
							
							
							
						 
						
							2019-10-19 23:21:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								90d516d42b 
								
							 
						 
						
							
							
								
								Store status data inside flag activity  
							
							
							
						 
						
							2019-10-15 16:52:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								35068baf65 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/reports-groups-and-multiple-state-update  
							
							
							
						 
						
							2019-10-07 15:41:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								7aceaa517b 
								
							 
						 
						
							
							
								
								Admin API: Reports, grouped by status  
							
							
							
						 
						
							2019-10-07 15:39:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								61097ba6ab 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'reactions'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2019-10-06 08:11:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4b8524f392 
								
							 
						 
						
							
							
								
								ActivityPub / Transmogrifier: Correctly store incoming Update id.  
							
							
							
						 
						
							2019-10-05 14:49:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d9aaea44ff 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-10-05 10:42:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								83631752af 
								
							 
						 
						
							
							
								
								removed legacy api: "/objects/:uuid/likes"  
							
							
							
						 
						
							2019-10-04 22:35:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								8dcc2f9f5e 
								
							 
						 
						
							
							
								
								Admin API: Allow changing the state of multiple reports at once  
							
							
							
						 
						
							2019-10-04 19:00:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								568a995d64 
								
							 
						 
						
							
							
								
								ActivityPub: Change addressing of Undo.  
							
							
							
						 
						
							2019-10-04 16:32:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9cfe9a57c5 
								
							 
						 
						
							
							
								
								CommonAPI: Add unreactions.  
							
							
							
						 
						
							2019-10-02 15:38:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								dfe5c958eb 
								
							 
						 
						
							
							
								
								ActivityPub: Add undo for emoji reactions.  
							
							
							
						 
						
							2019-10-02 15:08:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								557223b2b5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-10-02 13:27:55 +02:00