lain 
								
							 
						 
						
							
							
							
							
								
							
							
								46915207b6 
								
							 
						 
						
							
							
								
								Remove whole_db parameter everywhere, it's not used anymore  
							
							
							
						 
						
							2020-01-28 14:40:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								34fc0ca053 
								
							 
						 
						
							
							
								
								Emoji reactions: Add sanity checks for the cache  
							
							
							
						 
						
							2020-01-23 12:34:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6e6f1ead31 
								
							 
						 
						
							
							
								
								Merge branch 'no-error-404' into 'develop'  
							
							... 
							
							
							
							Log at debug level for object deletion, not error.
See merge request pleroma/pleroma!2066  
							
						 
						
							2020-01-22 17:55:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								be27777156 
								
							 
						 
						
							
							
								
								Merge branch 'admin-be' into 'develop'  
							
							... 
							
							
							
							Config api for admin-fe
Closes  #1406 
See merge request pleroma/pleroma!1976  
							
						 
						
							2020-01-22 17:13:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								dd3fc50ea4 
								
							 
						 
						
							
							
								
								Emoji reactions: Change cache and reply format  
							
							
							
						 
						
							2020-01-22 13:57:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								503d966e9f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into admin-be  
							
							
							
						 
						
							2020-01-21 10:32:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6a716e3fe5 
								
							 
						 
						
							
							
								
								Merge branch 'credo/version-bump-1.1.5' into 'develop'  
							
							... 
							
							
							
							Bump credo to 1.1.5
See merge request pleroma/pleroma!2115  
							
						 
						
							2020-01-20 14:42:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5c533e10e7 
								
							 
						 
						
							
							
								
								Bump credo to 1.1.5  
							
							
							
						 
						
							2020-01-20 12:17:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6cf3b19a38 
								
							 
						 
						
							
							
								
								transmogrifier.ex: simplify handle_incoming of actors  
							
							
							
						 
						
							2020-01-19 07:06:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								70c7a26de8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into admin-be  
							
							
							
						 
						
							2020-01-14 14:52:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2f5b8fbeb3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1354  
							
							
							
						 
						
							2020-01-12 12:12:15 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1630ecaa20 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into admin-be  
							
							
							
						 
						
							2020-01-11 12:15:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2753285b77 
								
							 
						 
						
							
							
								
								config editing through database  
							
							
							
						 
						
							2020-01-10 15:51:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								70410dfafd 
								
							 
						 
						
							
							
								
								fix create service actor  
							
							
							
						 
						
							2020-01-08 16:40:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c51e93978e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/custom-runtime-modules' into 'develop'  
							
							... 
							
							
							
							Add support for custom modules at runtime
Closes  #1448 
See merge request pleroma/pleroma!2039  
							
						 
						
							2019-12-21 11:56:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								7bd0bca2ab 
								
							 
						 
						
							
							
								
								fixed remote follow  
							
							
							
						 
						
							2019-12-20 16:33:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								432b3067d4 
								
							 
						 
						
							
							
								
								Do not crash when remote user follower and following counters are hidden  
							
							
							
						 
						
							2019-12-19 19:26:46 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8f79f433bc 
								
							 
						 
						
							
							
								
								Hide follower counter when hiding is activated  
							
							
							
						 
						
							2019-12-17 13:34:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b9a87b1baa 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/custom-runtime-modules  
							
							
							
						 
						
							2019-12-16 22:34:21 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Phil Hagelberg 
								
							 
						 
						
							
							
							
							
								
							
							
								02c3031e99 
								
							 
						 
						
							
							
								
								Don't log when users or objects are deleted.  
							
							
							
						 
						
							2019-12-13 12:05:53 -08: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								7528322f83 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/custom-runtime-modules  
							
							
							
						 
						
							2019-12-13 01:51:52 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								ee6805850c 
								
							 
						 
						
							
							
								
								Set log level to debug for not important messages  
							
							
							
						 
						
							2019-12-11 17:47:19 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								43d9c06a2a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/custom-runtime-modules'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2019-12-10 13:38:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								701815e64c 
								
							 
						 
						
							
							
								
								[ActivityPub] Configurable ActivityPub actor type  
							
							
							
						 
						
							2019-12-10 13:19:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a37bd5c255 
								
							 
						 
						
							
							
								
								Change log level  
							
							
							
						 
						
							2019-12-10 15:08:57 +07: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