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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								427d0c2a00 
								
							 
						 
						
							
							
								
								Store private announcements in object.data["announcements"], filter them on display  
							
							
							
						 
						
							2019-10-01 22:39:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b923842e96 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-09-30 13:57:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								1f9de2a8cd 
								
							 
						 
						
							
							
								
								activitypub: implement IR-level considerations for Listen activities  
							
							
							
						 
						
							2019-09-30 10:39:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								95a4a19417 
								
							 
						 
						
							
							
								
								Merge branch 'support/tests' into 'develop'  
							
							... 
							
							
							
							add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627  
							
						 
						
							2019-09-17 14:47:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8751809e1e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into support/tests  
							
							
							
						 
						
							2019-09-15 14:22:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6bcedb693c 
								
							 
						 
						
							
							
								
								[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	docs/config.md
#	mix.lock 
							
						 
						
							2019-09-14 16:11:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e5b3ad3d04 
								
							 
						 
						
							
							
								
								ActivityPub: Use is_unicode_emoji? function.  
							
							
							
						 
						
							2019-09-13 16:06:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								39dc9b470c 
								
							 
						 
						
							
							
								
								Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils  
							
							
							
						 
						
							2019-09-13 12:44:59 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ae506ca997 
								
							 
						 
						
							
							
								
								fix formatting  
							
							
							
						 
						
							2019-09-04 21:40:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								e2011a667c 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/utils.ex  
							
							
							
						 
						
							2019-09-04 18:35:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								8306078de1 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/utils.ex  
							
							
							
						 
						
							2019-09-04 17:31:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								a890451187 
								
							 
						 
						
							
							
								
								fetch_announcements -> take_announcements  
							
							
							
						 
						
							2019-09-04 17:42:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8cbad5500c 
								
							 
						 
						
							
							
								
								add tests for activity_pub/utils.ex  
							
							
							
						 
						
							2019-09-04 15:25:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9bc12b88b3 
								
							 
						 
						
							
							
								
								ActivityPub: Save emoji reactions in object.  
							
							
							
						 
						
							2019-09-03 16:50:04 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e890ea7e82 
								
							 
						 
						
							
							
								
								[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	config/config.exs 
							
						 
						
							2019-08-31 14:25:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f017260cdc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-08-27 16:38:51 -05:00