lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d39b72c8fa 
								
							 
						 
						
							
							
								
								Merge branch 'feature/captcha-expose-timeout' into 'develop'  
							
							... 
							
							
							
							Expose seconds_valid in Pleroma Captcha API endpoint
Closes  #1954 
See merge request pleroma/pleroma!2812  
							
						 
						
							2020-07-30 08:41:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cff7bb5cd4 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1933-update-dependency  
							
							
							
						 
						
							2020-07-30 08:52:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								33f0427809 
								
							 
						 
						
							
							
								
								Expose seconds_valid in Pleroma Captcha API endpoint  
							
							
							
						 
						
							2020-07-29 16:07:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								702f0fb822 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into mrf-silence  
							
							
							
						 
						
							2020-07-29 13:01:16 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								93638935d7 
								
							 
						 
						
							
							
								
								SimpleMRF: :silence --> :followers_only  
							
							
							
						 
						
							2020-07-29 12:58:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								00d090004e 
								
							 
						 
						
							
							
								
								:show_reactions, refactor the other test  
							
							
							
						 
						
							2020-07-29 12:50:11 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								026a51cb27 
								
							 
						 
						
							
							
								
								:show_reactions, add CHANGELOG.md, refactor test  
							
							
							
						 
						
							2020-07-29 12:45:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d8a01c9432 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into hide-reactions  
							
							
							
						 
						
							2020-07-29 12:43:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a6d3bb5f30 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1023' into 'develop'  
							
							... 
							
							
							
							[#1023 ] added generated  `pleroma.env`
See merge request pleroma/pleroma!2763  
							
						 
						
							2020-07-29 13:45:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d9bf2c58df 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration  
							
							
							
						 
						
							2020-07-29 14:42:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								269b61a240 
								
							 
						 
						
							
							
								
								Merge branch '1996-dont-break-on-chatmessages' into 'develop'  
							
							... 
							
							
							
							EnsureRePrepended: Don't break on chat messages.
Closes  #1996 
See merge request pleroma/pleroma!2808  
							
						 
						
							2020-07-29 12:20:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								de5c7e20a3 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/remote-user-atom' into 'develop'  
							
							... 
							
							
							
							feed/user_controller: Return 404 when the user is remote
Closes  #1911 
See merge request pleroma/pleroma!2811  
							
						 
						
							2020-07-29 12:16:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2e27847573 
								
							 
						 
						
							
							
								
								feed/user_controller: Return 404 when the user is remote  
							
							
							
						 
						
							2020-07-29 14:02:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								79f9ddd8b7 
								
							 
						 
						
							
							
								
								Merge branch 'by-approval' into 'develop'  
							
							... 
							
							
							
							Registrations "by approval" mode
Closes  #1931 
See merge request pleroma/pleroma!2757  
							
						 
						
							2020-07-29 11:27:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c25c21dd22 
								
							 
						 
						
							
							
								
								AccountController: Don't explicitly ask to keep users unconfirmed.  
							
							... 
							
							
							
							Confirmation is set in User.register_changeset based on the config
settings. 
							
						 
						
							2020-07-29 11:47:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								edf8b6abfe 
								
							 
						 
						
							
							
								
								EnsureRePrepended: Don't break on chat messages.  
							
							
							
						 
						
							2020-07-29 10:53:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								15b8446cdb 
								
							 
						 
						
							
							
								
								updated dev & test packages  
							
							
							
						 
						
							2020-07-29 06:47:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c90f7f715 
								
							 
						 
						
							
							
								
								SimpleMRF: Let instances be silenced  
							
							
							
						 
						
							2020-07-28 19:06:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3b7c454418 
								
							 
						 
						
							
							
								
								Let favourites and emoji reactions optionally be hidden  
							
							
							
						 
						
							2020-07-28 14:58:30 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ad5c42628a 
								
							 
						 
						
							
							
								
								FrontendStatic: Add plug to serve frontends based on configuration.  
							
							
							
						 
						
							2020-07-28 17:35:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f688c8df82 
								
							 
						 
						
							
							
								
								Fix User.registration_reason HTML sanitizing issues  
							
							
							
						 
						
							2020-07-27 20:36:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f43518eb74 
								
							 
						 
						
							
							
								
								Lint, fix test  
							
							
							
						 
						
							2020-07-27 19:22:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6f44a0ee84 
								
							 
						 
						
							
							
								
								Add configurable registration_reason limit  
							
							
							
						 
						
							2020-07-27 15:13:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6747bf2e16 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into by-approval  
							
							
							
						 
						
							2020-07-27 12:29:18 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9e6f4694dd 
								
							 
						 
						
							
							
								
								Pipeline: Unify embedded_object / object_data, move to validator.  
							
							
							
						 
						
							2020-07-27 16:39:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								762c9ea564 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation  
							
							
							
						 
						
							2020-07-27 16:19:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2a3abfd326 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1934-welcome-email' into 'develop'  
							
							... 
							
							
							
							[#1934 ] welcome email
See merge request pleroma/pleroma!2786  
							
						 
						
							2020-07-27 12:34:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6931dbfa58 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into by-approval  
							
							
							
						 
						
							2020-07-26 15:46:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								643664d583 
								
							 
						 
						
							
							
								
								added migrate old settings to new  
							
							
							
						 
						
							2020-07-25 09:16:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								1dd6de03ee 
								
							 
						 
						
							
							
								
								CommonAPI Tests: Check that undoing objects federates them as embeds.  
							
							
							
						 
						
							2020-07-24 14:54:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								3d13fb05f8 
								
							 
						 
						
							
							
								
								Side Effects: On undoing, put information about the undone object.  
							
							
							
						 
						
							2020-07-24 14:40:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								91f3cf9bc6 
								
							 
						 
						
							
							
								
								Pipeline: Add embedded object federation.  
							
							
							
						 
						
							2020-07-24 14:06:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								51627a10e5 
								
							 
						 
						
							
							
								
								Merge branch 'unblock-domain-via-query' into 'develop'  
							
							... 
							
							
							
							Allow unblocking a domain via query params
Closes  #1971 
See merge request pleroma/pleroma!2783  
							
						 
						
							2020-07-23 20:06:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4bfad0b483 
								
							 
						 
						
							
							
								
								Support blocking via query parameters as well and document the change.  
							
							
							
						 
						
							2020-07-23 12:59:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								6100b90209 
								
							 
						 
						
							
							
								
								Merge branch '1976-status-view-fixes' into 'develop'  
							
							... 
							
							
							
							StatusView: Handle badly formatted emoji reactions.
Closes  #1976 
See merge request pleroma/pleroma!2788  
							
						 
						
							2020-07-23 16:58:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								67ab9a7928 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1934-welcome-email  
							
							
							
						 
						
							2020-07-23 16:36:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								76aa49a0c5 
								
							 
						 
						
							
							
								
								Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'  
							
							... 
							
							
							
							[#1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting
Closes  #1973 
See merge request pleroma/pleroma!2791  
							
						 
						
							2020-07-23 12:52:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9ea51a6de5 
								
							 
						 
						
							
							
								
								[ #2791 ] AccountView: renamed :force option to :skip_visibility_check.  
							
							
							
						 
						
							2020-07-23 15:08:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b2ba70eec4 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/mrf-reject-logging' into 'develop'  
							
							... 
							
							
							
							Fix  #783 : Make MRF reject log as info level instead of error
Closes  #783 
See merge request pleroma/pleroma!2758  
						
							2020-07-23 11:08:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								250e0369c7 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1878' into 'develop'  
							
							... 
							
							
							
							[#1878 ] fix reset confirmation email in admin section
See merge request pleroma/pleroma!2751  
							
						 
						
							2020-07-23 10:56:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a81581472f 
								
							 
						 
						
							
							
								
								Merge branch 'linkify' into 'develop'  
							
							... 
							
							
							
							Fix Linkify
See merge request pleroma/pleroma!2792  
							
						 
						
							2020-07-23 10:28:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								7991ddad58 
								
							 
						 
						
							
							
								
								added warning to use old keys  
							
							
							
						 
						
							2020-07-23 09:01:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b6488a4db4 
								
							 
						 
						
							
							
								
								Update linkify migration tests to use config from ConfigDB  
							
							
							
						 
						
							2020-07-22 16:11:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c7a0016f9f 
								
							 
						 
						
							
							
								
								Migration to fix malformed Pleroma.Formatter config  
							
							
							
						 
						
							2020-07-22 14:32:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b87a1f8eaf 
								
							 
						 
						
							
							
								
								Refactor require_migration/1 into a test helper function  
							
							
							
						 
						
							2020-07-22 14:32:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								67389b77af 
								
							 
						 
						
							
							
								
								Add AutolinkerToLinkify migration test  
							
							
							
						 
						
							2020-07-22 14:32:24 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6f5f7af607 
								
							 
						 
						
							
							
								
								[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.  
							
							... 
							
							
							
							Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting. 
							
						 
						
							2020-07-22 19:06:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1c9752cff4 
								
							 
						 
						
							
							
								
								Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'  
							
							... 
							
							
							
							Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777  
							
						 
						
							2020-07-22 15:09:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								0cb9e1da74 
								
							 
						 
						
							
							
								
								StatusView: Handle badly formatted emoji reactions.  
							
							
							
						 
						
							2020-07-22 14:44:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5879d36854 
								
							 
						 
						
							
							
								
								fix sender for welcome email  
							
							
							
						 
						
							2020-07-22 15:34:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8d6f7aec21 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1023  
							
							
							
						 
						
							2020-07-22 09:24:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								7cafb96c02 
								
							 
						 
						
							
							
								
								added tests  
							
							
							
						 
						
							2020-07-22 08:58:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								109836306c 
								
							 
						 
						
							
							
								
								Test that Emoji Packs can be listed when instance is not public  
							
							
							
						 
						
							2020-07-21 17:27:13 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5b1eeb06d8 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2784  
							
						 
						
							2020-07-21 22:18:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								696c13ce54 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'linkify' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2677  
							
						 
						
							2020-07-21 22:17:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2b5d9eb105 
								
							 
						 
						
							
							
								
								Merge branch 'linkify' into 'develop'  
							
							... 
							
							
							
							AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677  
							
						 
						
							2020-07-21 19:35:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fa2421dd7e 
								
							 
						 
						
							
							
								
								Merge branch 'gopher-fix' into 'develop'  
							
							... 
							
							
							
							Gopher: using atom keys in search params
See merge request pleroma/pleroma!2775  
							
						 
						
							2020-07-21 19:31:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bdb3375933 
								
							 
						 
						
							
							
								
								Allow unblocking a domain via query params  
							
							
							
						 
						
							2020-07-21 16:06:46 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6afc6717d6 
								
							 
						 
						
							
							
								
								copy tmp file if test depends on it  
							
							
							
						 
						
							2020-07-21 10:31:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3edaecae96 
								
							 
						 
						
							
							
								
								added welcome email  
							
							
							
						 
						
							2020-07-21 09:25:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ae74c52e22 
								
							 
						 
						
							
							
								
								Test angry face in formatter D:<  #1968  
							
							
							
						 
						
							2020-07-18 15:26:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								48f8b26c92 
								
							 
						 
						
							
							
								
								OpenAPI: Add :id to follower/following endpoints,  fixes   #1958  
							
							
							
						 
						
							2020-07-17 12:35:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								15f8921b11 
								
							 
						 
						
							
							
								
								Test that unapproved users can never log in regardless of admin settings  
							
							
							
						 
						
							2020-07-17 12:26:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5756843736 
								
							 
						 
						
							
							
								
								Fully delete users with status :approval_pending  
							
							
							
						 
						
							2020-07-17 12:19:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								880301985b 
								
							 
						 
						
							
							
								
								Formatter: Test link with local mention  
							
							
							
						 
						
							2020-07-16 16:34:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								6c59fe259d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1023  
							
							
							
						 
						
							2020-07-16 08:53:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9ce95fa68f 
								
							 
						 
						
							
							
								
								Use approval_required in /api/v1/instance  
							
							
							
						 
						
							2020-07-15 17:04:30 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b2d398b1d0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/gun-pool-registry  
							
							
							
						 
						
							2020-07-15 13:34:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9d30bacace 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/notification_settings  
							
							
							
						 
						
							2020-07-15 09:30:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0fe36b311c 
								
							 
						 
						
							
							
								
								Merge branch 'features/mrf-reasons' into 'develop'  
							
							... 
							
							
							
							Add rejection reason to our MRFs
See merge request pleroma/pleroma!2759  
							
						 
						
							2020-07-15 14:00:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d29b8997f4 
								
							 
						 
						
							
							
								
								MastoAPI: fix & test giving MRF reject reasons  
							
							
							
						 
						
							2020-07-15 15:25:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3f8bff8d6b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/sign-authority  
							
							
							
						 
						
							2020-07-15 15:49:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								e499275076 
								
							 
						 
						
							
							
								
								Don't test tls_options in adapter helper test.  
							
							
							
						 
						
							2020-07-15 15:26:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								bf3492ceb3 
								
							 
						 
						
							
							
								
								Connection Pool: add tests  
							
							
							
						 
						
							2020-07-15 15:26:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								721e89e88b 
								
							 
						 
						
							
							
								
								Remove tests for old pool  
							
							
							
						 
						
							2020-07-15 15:26:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4beff90f5 
								
							 
						 
						
							
							
								
								Create Question: Add context field to create  
							
							
							
						 
						
							2020-07-15 12:32:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								922ca23298 
								
							 
						 
						
							
							
								
								Question: Add tests on HTML tags in options  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1362  
							
						 
						
							2020-07-15 12:32:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c19bdc811e 
								
							 
						 
						
							
							
								
								Fix attachments in polls  
							
							
							
						 
						
							2020-07-15 12:32:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								040524c09f 
								
							 
						 
						
							
							
								
								Merge branch 'tests/apc2s-update_outbox' into 'develop'  
							
							... 
							
							
							
							AP C2S tests: Make sure you can't use another user's AP id
See merge request pleroma/pleroma!2767  
							
						 
						
							2020-07-15 10:12:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								39870d99b8 
								
							 
						 
						
							
							
								
								transmogrifier tests: Move & enhance in specialised modules  
							
							
							
						 
						
							2020-07-15 11:40:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								82895a4012 
								
							 
						 
						
							
							
								
								SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert  
							
							
							
						 
						
							2020-07-15 11:40:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								173f69c854 
								
							 
						 
						
							
							
								
								question_validator: fix for mastodon poll expiration  
							
							... 
							
							
							
							Mastodon activities do not have a "closed" field, this could be seen on
https://pouet.it/users/lanodan_tmp/statuses/104345126997708380 
which runs Mastodon 3.1.4 (SDF runs 3.1.2) 
							
						 
						
							2020-07-15 11:39:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								10bd08ef07 
								
							 
						 
						
							
							
								
								transmogrifier_test: test date, anyOf and oneOf completely  
							
							
							
						 
						
							2020-07-15 11:39:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7bcd7a9595 
								
							 
						 
						
							
							
								
								QuestionValidator: Create  
							
							
							
						 
						
							2020-07-15 11:39:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6d8427cca2 
								
							 
						 
						
							
							
								
								AP C2S tests: Make sure you can't use another user's AP id  
							
							
							
						 
						
							2020-07-15 09:59:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0d004a9d04 
								
							 
						 
						
							
							
								
								Email admins when a new unapproved account is up for review  
							
							
							
						 
						
							2020-07-14 20:31:20 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								48983e9421 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into by-approval  
							
							
							
						 
						
							2020-07-14 18:56:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fab44f6970 
								
							 
						 
						
							
							
								
								Test User with confirmation_pending: true, approval_pending: true  
							
							
							
						 
						
							2020-07-14 18:46:57 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20d24741af 
								
							 
						 
						
							
							
								
								AdminAPI: Add PATCH /api/pleroma/admin/users/approve endpoint  
							
							
							
						 
						
							2020-07-14 18:02:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								33f1b29b2c 
								
							 
						 
						
							
							
								
								AdminAPI: Filter users by need_approval  
							
							
							
						 
						
							2020-07-14 14:29:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b750129da1 
								
							 
						 
						
							
							
								
								AdminAPI: Return approval_pending with users  
							
							
							
						 
						
							2020-07-14 13:47:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								1dd767b8c7 
								
							 
						 
						
							
							
								
								Include port in host for signatures  
							
							
							
						 
						
							2020-07-14 21:44:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								777a7edc6b 
								
							 
						 
						
							
							
								
								Lint and fix test to match new log message  
							
							
							
						 
						
							2020-07-14 13:15:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a1570ba6ad 
								
							 
						 
						
							
							
								
								AdminAPI: Return registration_reason with users  
							
							
							
						 
						
							2020-07-14 13:08:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								3f65f2ea79 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'  
							
							... 
							
							
							
							Support for hosts with scheme in MediaProxy whitelist setting
Closes  #1922 
See merge request pleroma/pleroma!2754  
							
						 
						
							2020-07-14 18:07:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								2909dc873b 
								
							 
						 
						
							
							
								
								Merge branch '1940-admin-token-oauthless-auth' into 'develop'  
							
							... 
							
							
							
							[#1940 ] Reinstated OAuth-less `admin_token` authentication
Closes  #1940 
See merge request pleroma/pleroma!2760  
							
						 
						
							2020-07-14 16:48:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								124b4709dc 
								
							 
						 
						
							
							
								
								[ #1940 ] Added admin_token param (as admin_api_params/0) to existing Admin API OpenAPI operations.  
							
							
							
						 
						
							2020-07-14 19:31:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								246f49d685 
								
							 
						 
						
							
							
								
								Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'  
							
							... 
							
							
							
							Transmogrifier: filtering weirdness in address fields
Closes  #1916 
See merge request pleroma/pleroma!2762  
							
						 
						
							2020-07-14 15:17:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								858d9fc7e8 
								
							 
						 
						
							
							
								
								MRF Policies: Return a {:reject, reason} instead of {:reject, nil}  
							
							
							
						 
						
							2020-07-14 11:04:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9b225db7d8 
								
							 
						 
						
							
							
								
								[ #1940 ] Applied rate limit for requests with bad admin_token. Added doc warnings on admin_token setting.  
							
							
							
						 
						
							2020-07-14 11:58:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								cf3f8cb72a 
								
							 
						 
						
							
							
								
								[ #1940 ] Reinstated OAuth-less admin_token authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).  
							
							
							
						 
						
							2020-07-19 21:35:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3062f86613 
								
							 
						 
						
							
							
								
								added generated  pleroma.env  
							
							
							
						 
						
							2020-07-14 09:05:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ddf0415c4 
								
							 
						 
						
							
							
								
								Accept reason in POST /api/v1/accounts and store in DB  
							
							
							
						 
						
							2020-07-14 00:22:12 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									= 
								
							 
						 
						
							
							
							
							
								
							
							
								b221b640a2 
								
							 
						 
						
							
							
								
								Transmogrifier: filtering weirdness in address fields  
							
							
							
						 
						
							2020-07-13 22:43:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								80c21100db 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/notification_settings  
							
							
							
						 
						
							2020-07-13 13:32:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								5d215fd81f 
								
							 
						 
						
							
							
								
								Merge branch 'config-behaviours-runtime' into 'develop'  
							
							... 
							
							
							
							Config/Docs: Expand behaviour suggestions modules at runtime
Closes  #1941 
See merge request pleroma/pleroma!2755  
							
						 
						
							2020-07-13 15:45:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								8f9ee694ed 
								
							 
						 
						
							
							
								
								Merge branch 'features/profile-fields-emojo' into 'develop'  
							
							... 
							
							
							
							user: Add support for custom emojis in profile fields
See merge request pleroma/pleroma!2741  
							
						 
						
							2020-07-13 15:43:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2aac92e9e0 
								
							 
						 
						
							
							
								
								Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post  
							
							
							
						 
						
							2020-07-13 15:26:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								f918b6f86d 
								
							 
						 
						
							
							
								
								Merge branch '1937-renaming' into 'develop'  
							
							... 
							
							
							
							ActivityPub: Don't rename a clashing nickname with the same ap id.
Closes  #1937 
See merge request pleroma/pleroma!2748  
							
						 
						
							2020-07-13 12:06:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bcfd38c8f3 
								
							 
						 
						
							
							
								
								Make a user unapproved when registering with account_approval_required on  
							
							
							
						 
						
							2020-07-12 22:55:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4e5577818 
								
							 
						 
						
							
							
								
								Prevent unapproved users from logging in  
							
							
							
						 
						
							2020-07-12 22:55:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								51ab8d0128 
								
							 
						 
						
							
							
								
								Add account_approval_required instance setting  
							
							
							
						 
						
							2020-07-12 20:27:58 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a62f17da17 
								
							 
						 
						
							
							
								
								Add approval_pending field to User  
							
							
							
						 
						
							2020-07-12 20:27:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								4347d2de5e 
								
							 
						 
						
							
							
								
								Config/Docs: Expand behaviour suggestions at runtime  
							
							
							
						 
						
							2020-07-12 17:23:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b376442325 
								
							 
						 
						
							
							
								
								MediaProxy whitelist setting now supports hosts with scheme  
							
							... 
							
							
							
							added deprecation warning about using bare domains 
							
						 
						
							2020-07-12 12:41:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								aedbbec88a 
								
							 
						 
						
							
							
								
								Add Pleroma.Utils.command_available?/1 and use where appropriate  
							
							
							
						 
						
							2020-07-11 15:48:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								62fc8eab0d 
								
							 
						 
						
							
							
								
								fix reset confirmation email in admin section  
							
							
							
						 
						
							2020-07-11 07:20:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6167593881 
								
							 
						 
						
							
							
								
								Support Exiftool for stripping EXIF data  
							
							... 
							
							
							
							We really only want to strip location data anyway, and mogrify strips color profiles. 
							
						 
						
							2020-07-10 16:46:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3c0c1fd2ef 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1790-updated-oban  
							
							
							
						 
						
							2020-07-10 11:34:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								ce9514000d 
								
							 
						 
						
							
							
								
								Merge branch 'proxy-range-and-chunk' into 'develop'  
							
							... 
							
							
							
							ReverseProxy: Streaming and disable encoding if Range
Closes  #1860  and #1823 
See merge request pleroma/pleroma!2749  
							
						 
						
							2020-07-10 16:18:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								a1dace088c 
								
							 
						 
						
							
							
								
								ReverseProxy: Streaming and disable encoding if Range  
							
							... 
							
							
							
							Fixes  #1823 
Fixes  #1860  
						
							2020-07-10 17:23:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								93e494ec21 
								
							 
						 
						
							
							
								
								ActivityPub: Don't rename a clashing nickname with the same ap id.  
							
							
							
						 
						
							2020-07-10 14:10:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b39eb6ecc5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information  
							
							
							
						 
						
							2020-07-10 12:26:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								31a0ed5d01 
								
							 
						 
						
							
							
								
								Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'  
							
							... 
							
							
							
							Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
Closes admin-fe#107 and #1788 
See merge request pleroma/pleroma!2554  
							
						 
						
							2020-07-10 09:22:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4d809144d8 
								
							 
						 
						
							
							
								
								Merge branch 'cluster-test-ci' into 'develop'  
							
							... 
							
							
							
							RE-enable cluster tests on CI
See merge request pleroma/pleroma!2743  
							
						 
						
							2020-07-10 08:56:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								4ac6e6283f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2020-07-10 08:55:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								5ea6387572 
								
							 
						 
						
							
							
								
								Merge branch 'user-search-nickname-rank-boost' into 'develop'  
							
							... 
							
							
							
							Improved search results for localized nickname match
See merge request pleroma/pleroma!2733  
							
						 
						
							2020-07-10 08:49:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									stwf 
								
							 
						 
						
							
							
							
							
								
							
							
								08211eff22 
								
							 
						 
						
							
							
								
								Re-enable the federated tests, increase timeout  
							
							
							
						 
						
							2020-07-09 13:49:30 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cc7153cd82 
								
							 
						 
						
							
							
								
								user: Add support for custom emojis in profile fields  
							
							
							
						 
						
							2020-07-09 19:21:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2b979cc90c 
								
							 
						 
						
							
							
								
								Add AdminFE reports URL to report emails  
							
							
							
						 
						
							2020-07-09 11:55:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8ca1f3e8c6 
								
							 
						 
						
							
							
								
								Merge branch '1723-token-fixes' into 'develop'  
							
							... 
							
							
							
							AccountController: Return scope in proper format.
Closes  #1723 
See merge request pleroma/pleroma!2694  
							
						 
						
							2020-07-09 13:10:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f4469dc741 
								
							 
						 
						
							
							
								
								Merge branch 'features/favicons' into 'develop'  
							
							... 
							
							
							
							Add support for remote favicons
See merge request pleroma/pleroma!2261  
							
						 
						
							2020-07-09 13:09:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								bdc7b60610 
								
							 
						 
						
							
							
								
								Merge branch '1925-muting-reblogs' into 'develop'  
							
							... 
							
							
							
							AccountController: Fix muting / unmuting reblogs.
Closes  #1925 
See merge request pleroma/pleroma!2732  
							
						 
						
							2020-07-09 12:10:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								c2be0da79f 
								
							 
						 
						
							
							
								
								Admin API: fix GET /api/pleroma/admin/users/:nickname/credentials returning 404 when getting the credentials of a remote user while :instance, :limit_to_local_content is set to :unauthenticated  
							
							
							
						 
						
							2020-07-09 14:57:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								68036f5a3b 
								
							 
						 
						
							
							
								
								Merge branch 'follow-pipeline' into 'develop'  
							
							... 
							
							
							
							Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734  
							
						 
						
							2020-07-09 10:32:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								31259cabcc 
								
							 
						 
						
							
							
								
								fix test  
							
							
							
						 
						
							2020-07-09 07:16:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								123352ffa1 
								
							 
						 
						
							
							
								
								Removed unused trigram index on users. Fixed users_fts_index usage.  
							
							
							
						 
						
							2020-07-08 22:50:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								00e54f8fe7 
								
							 
						 
						
							
							
								
								ActivityPub: Remove follow and fix issues.  
							
							
							
						 
						
							2020-07-08 17:07:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9dda8b5427 
								
							 
						 
						
							
							
								
								CommonAPI: Switch to pipeline for following.  
							
							
							
						 
						
							2020-07-08 15:40:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								172f4aff8e 
								
							 
						 
						
							
							
								
								Transmogrifier: Move following to the pipeline.  
							
							
							
						 
						
							2020-07-08 14:30:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7d0e2b3fdd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline  
							
							
							
						 
						
							2020-07-08 13:23:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cdc153db31 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880  
							
							
							
						 
						
							2020-07-08 13:21:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6335b32aa8 
								
							 
						 
						
							
							
								
								Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'  
							
							... 
							
							
							
							[#1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes  #1895 
See merge request pleroma/pleroma!2731  
							
						 
						
							2020-07-08 10:55:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								704a383055 
								
							 
						 
						
							
							
								
								Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches.  
							
							
							
						 
						
							2020-07-08 13:14:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c0385cf47a 
								
							 
						 
						
							
							
								
								AccountController: Fix muting / unmuting reblogs.  
							
							
							
						 
						
							2020-07-08 11:52:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								e341f81785 
								
							 
						 
						
							
							
								
								fixed delete Like activity in remove user  
							
							
							
						 
						
							2020-07-08 09:06:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								312fc55f14 
								
							 
						 
						
							
							
								
								Add [:instances_favicons, :enabled] setting, defaults to false  
							
							
							
						 
						
							2020-07-08 06:28:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a679d80c9 
								
							 
						 
						
							
							
								
								Move get_favicon to Pleroma.Instances, use /  
							
							
							
						 
						
							2020-07-08 06:28:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f6d09fafee 
								
							 
						 
						
							
							
								
								Add support for remote favicons  
							
							
							
						 
						
							2020-07-08 06:28:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								a8447c3803 
								
							 
						 
						
							
							
								
								Merge branch '1918-avatar-background-header-reset-2' into 'develop'  
							
							... 
							
							
							
							Resolve "Better support for resetting avatar/header/background"
Closes  #1918 
See merge request pleroma/pleroma!2729  
							
						 
						
							2020-07-08 03:25:30 +00:00