Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								326575d5b7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into finch  
							
							
							
						 
						
							2021-12-27 11:31:15 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								a659428024 
								
							 
						 
						
							
							
								
								Merge branch 'restricted-moderators' into 'develop'  
							
							... 
							
							
							
							AdminAPI: Optionally restrict moderators from accessing sensitive data
See merge request pleroma/pleroma!3578  
							
						 
						
							2021-12-27 17:06:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								6e27fc9c12 
								
							 
						 
						
							
							
								
								Merge branch 'log-slow-queries' into 'develop'  
							
							... 
							
							
							
							Log slow Ecto queries
See merge request pleroma/pleroma!3553  
							
						 
						
							2021-12-27 15:41:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								08c0f09bad 
								
							 
						 
						
							
							
								
								Made slow queries logging disabled by default.  
							
							
							
						 
						
							2021-12-27 09:13:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								f02715c4b2 
								
							 
						 
						
							
							
								
								Fix lint errors  
							
							
							
						 
						
							2021-12-27 03:42:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								f66675f349 
								
							 
						 
						
							
							
								
								API: fix duplicate :get_password_token route  
							
							
							
						 
						
							2021-12-27 02:57:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								1c223331fc 
								
							 
						 
						
							
							
								
								API: show info about privileged staff in instance metadata  
							
							
							
						 
						
							2021-12-27 02:28:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								cd1041c3a4 
								
							 
						 
						
							
							
								
								API: optionally restrict moderators from accessing sensitive data  
							
							
							
						 
						
							2021-12-27 02:27:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3e9e7178bc 
								
							 
						 
						
							
							
								
								Configurability of slow queries logging ([:pleroma, :telemetry, :slow_queries_logging]). Adjusted log messages truncation to 65 kb (was default: 8 kb). Non-truncated logging of slow query params.  
							
							
							
						 
						
							2021-12-26 22:49:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								4cf03046f5 
								
							 
						 
						
							
							
								
								Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch  
							
							
							
						 
						
							2021-12-26 16:57:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								6efbd08854 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch  
							
							
							
						 
						
							2021-12-26 16:41:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								913141379c 
								
							 
						 
						
							
							
								
								Merge branch 'profile-directory' into 'develop'  
							
							... 
							
							
							
							MastoAPI: Profile directory
See merge request pleroma/pleroma!3573  
							
						 
						
							2021-12-26 02:35:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								de006443f0 
								
							 
						 
						
							
							
								
								MastoAPI: Profile directory  
							
							
							
						 
						
							2021-12-26 02:35:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								db2bf55e9b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into notice-routes  
							
							
							
						 
						
							2021-12-25 19:57:53 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								73609211a4 
								
							 
						 
						
							
							
								
								Merge branch 'account-notes' into 'develop'  
							
							... 
							
							
							
							MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540  
							
						 
						
							2021-12-25 01:41:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								b96a58ff28 
								
							 
						 
						
							
							
								
								Merge branch 'account-subscriptions' into 'develop'  
							
							... 
							
							
							
							MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555  
							
						 
						
							2021-12-25 01:34:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								9775955974 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into remote-follow-api  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-25 00:52:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								d9746ae4cb 
								
							 
						 
						
							
							
								
								Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'  
							
							... 
							
							
							
							Handle Reject for already-accepted Follows properly
Closes  #2766  and #2802 
See merge request pleroma/pleroma!3568  
							
						 
						
							2021-12-23 16:00:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f8fc34593 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into moderators  
							
							
							
						 
						
							2021-12-19 12:55:36 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								50892a198d 
								
							 
						 
						
							
							
								
								Merge branch 'mkljczk-develop-patch-64464' into 'develop'  
							
							... 
							
							
							
							Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523  
							
						 
						
							2021-12-19 18:51:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								b0d2b53934 
								
							 
						 
						
							
							
								
								Merge branch 'manifest' into 'develop'  
							
							... 
							
							
							
							Expose /manifest.json for PWA
Closes  #882 
See merge request pleroma/pleroma!3544  
							
						 
						
							2021-12-19 18:18:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e009950845 
								
							 
						 
						
							
							
								
								Slow queries logging improvements: added EXPLAIN results, listed params, improved stacktrace.  
							
							
							
						 
						
							2021-12-19 20:45:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								df5359aa72 
								
							 
						 
						
							
							
								
								Merge branch 'replies-count' into 'develop'  
							
							... 
							
							
							
							Fix replies count for remote replies
See merge request pleroma/pleroma!3541  
							
						 
						
							2021-12-19 17:36:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								d1510c98d7 
								
							 
						 
						
							
							
								
								Merge branch 'link-headers-chats' into 'develop'  
							
							... 
							
							
							
							Add link headers in ChatController.index2
See merge request pleroma/pleroma!3562  
							
						 
						
							2021-12-19 17:35:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								1ff9ffed83 
								
							 
						 
						
							
							
								
								Merge branch 'live-dashboard' into 'develop'  
							
							... 
							
							
							
							Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566  
							
						 
						
							2021-12-19 17:35:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4f9cb1c1b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into manifest  
							
							
							
						 
						
							2021-12-19 11:33:10 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								bd853199d9 
								
							 
						 
						
							
							
								
								Merge branch 'v2-suggestions' into 'develop'  
							
							... 
							
							
							
							V2 suggestions
See merge request pleroma/pleroma!3547  
							
						 
						
							2021-12-19 17:31:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								7c1d804554 
								
							 
						 
						
							
							
								
								Merge branch 'fix-search-dos' into 'develop'  
							
							... 
							
							
							
							Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563  
							
						 
						
							2021-12-19 17:30:52 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									a1batross 
								
							 
						 
						
							
							
							
							
								
							
							
								31b9034a27 
								
							 
						 
						
							
							
								
								emoji/loader.ex: be more verbose about which emoji pack config is loading now  
							
							... 
							
							
							
							To avoid issue when one of the hundred JSON files is malformed and
administrator don't know which one 
							
						 
						
							2021-12-17 14:15:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5660bee2dc 
								
							 
						 
						
							
							
								
								Dirty hack to make mediaproxy functional by relying on Hackney for that part  
							
							
							
						 
						
							2021-12-16 11:36:58 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1b89fe3aa 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into live-dashboard  
							
							
							
						 
						
							2021-12-15 19:05:36 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								29d80b39f2 
								
							 
						 
						
							
							
								
								Add Phoenix LiveDashboard  
							
							... 
							
							
							
							Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com> 
							
						 
						
							2021-12-15 19:05:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6eb7d69e60 
								
							 
						 
						
							
							
								
								Merge branch 'delete-account-fix' into 'develop'  
							
							... 
							
							
							
							TwitterAPI: allow deleting one's own account with request body
Closes  #2799  and #2746 
See merge request pleroma/pleroma!3564  
							
						 
						
							2021-12-15 21:26:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								4e98ba3c3a 
								
							 
						 
						
							
							
								
								Application: Actually start finch if it's needed  
							
							
							
						 
						
							2021-12-15 15:42:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								abb62dd886 
								
							 
						 
						
							
							
								
								Application, dependencies: prepare for finch  
							
							
							
						 
						
							2021-12-15 13:53:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8672ad6b00 
								
							 
						 
						
							
							
								
								TwitterAPI: allow deleting one's own account with request body  
							
							
							
						 
						
							2021-12-13 17:07:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								108dfd1f87 
								
							 
						 
						
							
							
								
								Search: limit number of results  
							
							
							
						 
						
							2021-12-12 22:50:07 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								dff435488d 
								
							 
						 
						
							
							
								
								Add link headers in ChatController.index2  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-12 17:43:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2c96668a2c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions  
							
							
							
						 
						
							2021-12-07 13:41:54 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f03d71ea6 
								
							 
						 
						
							
							
								
								AttachmentValidator: ingest width and height  
							
							
							
						 
						
							2021-12-07 12:59:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								ca8c676867 
								
							 
						 
						
							
							
								
								Linting.  
							
							
							
						 
						
							2021-12-07 12:12:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Finn Behrens 
								
							 
						 
						
							
							
							
							
								
							
							
								8af53101fb 
								
							 
						 
						
							
							
								
								move result into with guard  
							
							
							
						 
						
							2021-12-07 09:18:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								c96e52b88c 
								
							 
						 
						
							
							
								
								Add 'notifying' to relationship for compatibility with Mastodon  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-06 21:24:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								64a4c147b1 
								
							 
						 
						
							
							
								
								MastoAPI: accept notify param in follow request  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-06 19:36:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								db46913dcc 
								
							 
						 
						
							
							
								
								make linter happy  
							
							
							
						 
						
							2021-12-06 11:50:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								cd8bdbc761 
								
							 
						 
						
							
							
								
								Make deactivated user check into a subquery  
							
							... 
							
							
							
							Fixes  #2792  
						
							2021-12-06 11:44:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								949a53e327 
								
							 
						 
						
							
							
								
								Log Ecto queries > 500ms  
							
							
							
						 
						
							2021-12-05 18:29:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8286ceb465 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into password-reset  
							
							
							
						 
						
							2021-12-03 00:11:38 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5da4f33bf1 
								
							 
						 
						
							
							
								
								Restore POST /auth/password  
							
							
							
						 
						
							2021-12-03 00:10:57 -06:00