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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8f79f433bc 
								
							 
						 
						
							
							
								
								Hide follower counter when hiding is activated  
							
							
							
						 
						
							2019-12-17 13:34:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								bcd16676a7 
								
							 
						 
						
							
							
								
								Publisher: check out a connection for inserting publish_one jobs  
							
							... 
							
							
							
							Related to #1474 , federation of one post on my istance creates in
best-case 360 jobs, so if they for some reason take a while to insert,
it will exhaust the connection pool. This fixes it by checking out one
dedicated connection for inserting them. 
							
						 
						
							2019-12-13 14:27:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								3ecf131511 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/report-notes  
							
							
							
						 
						
							2019-12-12 02:16:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9ef912aecf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1411  
							
							
							
						 
						
							2019-12-11 15:02:53 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								1ad96d667a 
								
							 
						 
						
							
							
								
								remove single-step pipe  
							
							
							
						 
						
							2019-12-11 09:08:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								8cfaab8f04 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'domain-block-precedence'  
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/user.ex 
							
						 
						
							2019-12-10 16:54:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								25f774f7c1 
								
							 
						 
						
							
							
								
								format activity_pub.ex  
							
							
							
						 
						
							2019-12-10 16:41:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								19d228cc58 
								
							 
						 
						
							
							
								
								modify SQL to include followed-but-domain-blocked activities  
							
							
							
						 
						
							2019-12-10 16:40:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								701815e64c 
								
							 
						 
						
							
							
								
								[ActivityPub] Configurable ActivityPub actor type  
							
							
							
						 
						
							2019-12-10 13:19:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								af5fef1f22 
								
							 
						 
						
							
							
								
								Merge branch 'fix/clause-never-matches' into 'develop'  
							
							... 
							
							
							
							Fix never matching clause
See merge request pleroma/pleroma!2042  
							
						 
						
							2019-12-08 13:50:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a21340caa1 
								
							 
						 
						
							
							
								
								Fix never matching clause  
							
							... 
							
							
							
							`length/1` is only used with lists. 
							
						 
						
							2019-12-08 16:46:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								29a3f70cba 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'  
							
							... 
							
							
							
							ActivityPub: For user timelines, respects blocks.
Closes  #1463 
See merge request pleroma/pleroma!2041  
							
						 
						
							2019-12-08 11:23:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e8cee4d9a0 
								
							 
						 
						
							
							
								
								ActivityPub: For user timelines, respects blocks.  
							
							... 
							
							
							
							Unless the timeline belongs to a blocked user. 
							
						 
						
							2019-12-06 14:25:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cdff5b8267 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/mrf-delete  
							
							
							
						 
						
							2019-12-06 00:12:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9f99640cfc 
								
							 
						 
						
							
							
								
								ActivityPub: Fix deletes being exempt from MRF  
							
							... 
							
							
							
							Closes  #1461  
						
							2019-12-05 21:45:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								67d8df04a4 
								
							 
						 
						
							
							
								
								Merge branch '1335-user-api-id-fields-relations' into 'develop'  
							
							... 
							
							
							
							[#1335 ] User: refactoring of AP ID fields into relations
Closes  #1335 
See merge request pleroma/pleroma!1963  
							
						 
						
							2019-12-05 17:16:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d0bd4348b3 
								
							 
						 
						
							
							
								
								Merge branch 'feature/admin-api-render-whole-status' into 'develop'  
							
							... 
							
							
							
							Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007  
							
						 
						
							2019-12-05 13:34:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								e21afdb7c7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1411  
							
							
							
						 
						
							2019-12-05 12:18:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								30caf3e51e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/user.ex 
							
						 
						
							2019-12-04 18:56:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								4b60d41db9 
								
							 
						 
						
							
							
								
								Add report notes  
							
							
							
						 
						
							2019-12-04 00:26:37 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7722e5a67a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/move-activity' into 'develop'  
							
							... 
							
							
							
							Support "Move" activity
Closes  #1316 
See merge request pleroma/pleroma!1883  
							
						 
						
							2019-12-02 16:26:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								88f7cf51d4 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1411  
							
							
							
						 
						
							2019-12-01 16:18:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0326683932 
								
							 
						 
						
							
							
								
								hide follower/following for friendica  
							
							
							
						 
						
							2019-11-30 15:43:05 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c8d3c3bfec 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex 
							
						 
						
							2019-11-26 10:42:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								b62be2564c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-render-whole-status  
							
							
							
						 
						
							2019-11-26 00:25:43 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								dc9090810d 
								
							 
						 
						
							
							
								
								Merge branch 'fix/ap-disable-remote-render' into 'develop'  
							
							... 
							
							
							
							Disable rendering AP representation for remote users and objects
See merge request pleroma/pleroma!2010  
							
						 
						
							2019-11-25 15:23:45 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								02f7383891 
								
							 
						 
						
							
							
								
								ActivityPub controller: do not render remote users  
							
							
							
						 
						
							2019-11-25 17:19:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								5f981178d0 
								
							 
						 
						
							
							
								
								Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'  
							
							... 
							
							
							
							Admin API: list all statuses from a given instance
See merge request pleroma/pleroma!1981  
							
						 
						
							2019-11-25 13:29:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								9374b52756 
								
							 
						 
						
							
							
								
								Merge branch 'fix/update-reports-old-format' into 'develop'  
							
							... 
							
							
							
							Admin API: Fix error when trying to update reports in the "old" format
See merge request pleroma/pleroma!1986  
							
						 
						
							2019-11-25 13:29:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								82f4e4760e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance  
							
							
							
						 
						
							2019-11-25 01:46:18 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								fd24467b92 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance  
							
							
							
						 
						
							2019-11-25 01:43:11 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								2b341627da 
								
							 
						 
						
							
							
								
								Admin API: Render whole status in grouped reports  
							
							
							
						 
						
							2019-11-25 00:04:29 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								cad9b325e5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/user/search.ex
#	test/user_test.exs 
							
						 
						
							2019-11-21 16:47:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8feb5dcb42 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1348' into 'develop'  
							
							... 
							
							
							
							[#1348 ] excluded invisible actors from gets  /api/v1/accounts/:id
See merge request pleroma/pleroma!1937  
							
						 
						
							2019-11-21 13:13:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								555edd01ab 
								
							 
						 
						
							
							
								
								[ #1335 ] User AP ID relations fetching performance optimizations.  
							
							
							
						 
						
							2019-11-20 12:19:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ba5cc30165 
								
							 
						 
						
							
							
								
								[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.  
							
							
							
						 
						
							2019-11-19 23:22:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								708fd234bd 
								
							 
						 
						
							
							
								
								fix order favorites activites  
							
							
							
						 
						
							2019-11-19 20:19:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5cee51fac5 
								
							 
						 
						
							
							
								
								fix order by for fetch_favorites  
							
							
							
						 
						
							2019-11-18 21:34:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0937895182 
								
							 
						 
						
							
							
								
								updated fetch_favorites  
							
							
							
						 
						
							2019-11-18 16:56:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4beb3ce5c5 
								
							 
						 
						
							
							
								
								/api/v1/favourites: added sorting for activites by adds to favorites  
							
							
							
						 
						
							2019-11-18 09:44:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								c506cc48ef 
								
							 
						 
						
							
							
								
								Admin API: Error when trying to update reports in the "old" format  
							
							
							
						 
						
							2019-11-16 18:44:48 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								01d9c093c3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							
							
						 
						
							2019-11-15 21:40:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c31ddce51e 
								
							 
						 
						
							
							
								
								[ #1335 ] Reorganized users.mutes as relation to UserMute entity.  
							
							
							
						 
						
							2019-11-15 21:38:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								eecd64cc07 
								
							 
						 
						
							
							
								
								object age policy: remove debug logging  
							
							
							
						 
						
							2019-11-14 19:56:14 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								5705cf0e3e 
								
							 
						 
						
							
							
								
								MRF: add ObjectAgePolicy which deals with old posts being imported  
							
							
							
						 
						
							2019-11-14 19:48:10 -06:00