lain 
								
							 
						 
						
							
							
							
							
								
							
							
								593b8b1e6a 
								
							 
						 
						
							
							
								
								Configuration: Skip thread containment by default  
							
							... 
							
							
							
							In my tests the interaction between thread containment and other restrictions
makes postgresql create some very bad query plans. This caused direct messages
to time out on soykaf, for example. 
							
						 
						
							2019-06-07 14:28:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								d5330ed125 
								
							 
						 
						
							
							
								
								Merge branch 'fix/replace-mix-env' into 'develop'  
							
							... 
							
							
							
							Replace Mix.env with Pleroma.Config.get(:env)
See merge request pleroma/pleroma!1254  
							
						 
						
							2019-06-07 10:58:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								cb89987ca1 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mix-tasks-ensure-no-endpoints-are-served' into 'develop'  
							
							... 
							
							
							
							Mix Tasks: Switch to Application.ensure_all_started instead of Mix.Task.run and ensure serve_endpoints is set to false
See merge request pleroma/pleroma!1255  
							
						 
						
							2019-06-07 10:56:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								bc597d888c 
								
							 
						 
						
							
							
								
								Mix Tasks: Switch to Application.ensure_all_started instead of  
							
							... 
							
							
							
							Mix.Task.run and ensure serve_endpoints is set to false
In release environments there is no Mix.Task.run and serve_endpoints
must be set to true for the endpoints to start, so we need to ensure it
is set to false before starting Pleroma for executing a mix task. 
							
						 
						
							2019-06-07 12:37:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								92213fb87c 
								
							 
						 
						
							
							
								
								Replace Mix.env with Pleroma.Config.get(:env)  
							
							... 
							
							
							
							Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases. 
							
						 
						
							2019-06-06 23:59:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								62cdf701f4 
								
							 
						 
						
							
							
								
								Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop'  
							
							... 
							
							
							
							Switch to manual Supervisor child specifications instead of Supervisor.Spec
See merge request pleroma/pleroma!1252  
							
						 
						
							2019-06-06 14:54:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5f1b6f5aca 
								
							 
						 
						
							
							
								
								Merge branch 'fix-search' into 'develop'  
							
							... 
							
							
							
							Fix search
Closes  #960 
See merge request pleroma/pleroma!1253  
							
						 
						
							2019-06-06 14:26:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cb2bcee842 
								
							 
						 
						
							
							
								
								User Search: Boost friends more strongly.  
							
							
							
						 
						
							2019-06-06 16:18:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7e9f7ea0c2 
								
							 
						 
						
							
							
								
								MastodonAPI: Add test for user search.  
							
							
							
						 
						
							2019-06-06 16:16:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9ae8f012a5 
								
							 
						 
						
							
							
								
								Switch to manual Supervisor child specifications instead of Supervisor.Spec  
							
							... 
							
							
							
							Supervisor.Spec is deprecated and causes warnings on Elixir master, see
https://hexdocs.pm/elixir/Supervisor.Spec.html  
							
						 
						
							2019-06-06 16:37:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								489bd30fb9 
								
							 
						 
						
							
							
								
								Merge branch 'improve-search' into 'develop'  
							
							... 
							
							
							
							[#943 ] Make the unauthenticated users limitation optional
See merge request pleroma/pleroma!1251  
							
						 
						
							2019-06-06 12:17:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								f82382de22 
								
							 
						 
						
							
							
								
								[ #943 ] Make the unauthenticated users limitation optional  
							
							
							
						 
						
							2019-06-06 12:17:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								3f6da9c45a 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/377-stuck-follow-request' into 'develop'  
							
							... 
							
							
							
							Bugfix/377 stuck follow request
Closes  #377 
See merge request pleroma/pleroma!1250  
							
						 
						
							2019-06-05 15:52:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								a511d2f900 
								
							 
						 
						
							
							
								
								Merge branch 'improve-search' into 'develop'  
							
							... 
							
							
							
							[#943 ] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220  
							
						 
						
							2019-06-05 15:51:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1370ba131 
								
							 
						 
						
							
							
								
								Utils: Use update_follow_state_for_all when appropriate.  
							
							
							
						 
						
							2019-06-05 16:51:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ad19bfc7fe 
								
							 
						 
						
							
							
								
								Utils: Split update_follow_state and update_follow_state_for_all.  
							
							
							
						 
						
							2019-06-05 16:43:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								827a51e777 
								
							 
						 
						
							
							
								
								CommonAPI: Add test for accept_follow_request.  
							
							
							
						 
						
							2019-06-05 15:45:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								076c9ae40e 
								
							 
						 
						
							
							
								
								User: Remove superfluous maybe_follow.  
							
							
							
						 
						
							2019-06-05 14:24:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3115b64cfe 
								
							 
						 
						
							
							
								
								Transmogrifier: Add tests for incoming follows to locked accounts.  
							
							
							
						 
						
							2019-06-05 14:10:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								50afe5ab9e 
								
							 
						 
						
							
							
								
								Merge branch 'fix-stuck-follows' into 'develop'  
							
							... 
							
							
							
							User: Don't error out when following a user that's already followed.
See merge request pleroma/pleroma!1249  
							
						 
						
							2019-06-05 11:07:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								eda4b00a6a 
								
							 
						 
						
							
							
								
								Merge branch 'oauth_consumer_support_code' into 'develop'  
							
							... 
							
							
							
							OAuth consumer: tests fix, comments, Keycloak config notes
See merge request pleroma/pleroma!1248  
							
						 
						
							2019-06-05 11:05:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								024dfdc39c 
								
							 
						 
						
							
							
								
								Typo + Linting.  
							
							
							
						 
						
							2019-06-05 12:45:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8b9a0dd4a7 
								
							 
						 
						
							
							
								
								User: Don't error out when following a user that's already followed.  
							
							... 
							
							
							
							This leads to a few situations where it is impossible to follow a user. 
							
						 
						
							2019-06-05 12:06:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3eefb274f4 
								
							 
						 
						
							
							
								
								OAuth consumer: tests fix, comments, Keycloak config notes.  
							
							
							
						 
						
							2019-06-05 13:02:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1cb245c982 
								
							 
						 
						
							
							
								
								Fix formatting  
							
							
							
						 
						
							2019-06-05 16:55:17 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5b04f07a1e 
								
							 
						 
						
							
							
								
								Limit search for unauthenticated users to local users only  
							
							
							
						 
						
							2019-06-05 16:51:04 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								17004a0f1a 
								
							 
						 
						
							
							
								
								Create index on activities.local  
							
							
							
						 
						
							2019-06-05 16:37:43 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								17a6f81f7b 
								
							 
						 
						
							
							
								
								Fix tests with enabled RUM  
							
							
							
						 
						
							2019-06-05 16:37:43 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								94b9e9d844 
								
							 
						 
						
							
							
								
								Update benchmark mix task  
							
							
							
						 
						
							2019-06-05 16:37:43 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								93397fce3d 
								
							 
						 
						
							
							
								
								Contain search for unauthenticated users  
							
							
							
						 
						
							2019-06-05 16:37:43 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e4babb1c9f 
								
							 
						 
						
							
							
								
								Merge branch 'explicit-addressing' into 'develop'  
							
							... 
							
							
							
							Explicit addressing
See merge request pleroma/pleroma!1239  
							
						 
						
							2019-06-05 08:28:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								5188add534 
								
							 
						 
						
							
							
								
								Merge branch 'remove-tag-warning' into 'develop'  
							
							... 
							
							
							
							Mix: Swallow git error messages during version number handling.
See merge request pleroma/pleroma!1247  
							
						 
						
							2019-06-04 15:46:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								ab4915edcb 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'  
							
							... 
							
							
							
							Participations: Filter out participations without activities.
Closes  #956  and #953 
See merge request pleroma/pleroma!1246  
							
						 
						
							2019-06-04 15:34:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								18c35d84fd 
								
							 
						 
						
							
							
								
								NodeInfo: Add explicit addressing to nodeinfo.  
							
							
							
						 
						
							2019-06-04 17:14:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b5e3b1e58a 
								
							 
						 
						
							
							
								
								Mix: Swallow git error messages during version number handling.  
							
							... 
							
							
							
							Otherwise sometimes a 'fatal' message will be printed, confusing users. 
							
						 
						
							2019-06-04 16:58:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f178a6f3f0 
								
							 
						 
						
							
							
								
								Merge branch 'issue/941' into 'develop'  
							
							... 
							
							
							
							[#941 ] add option skip_thread_containment
See merge request pleroma/pleroma!1237  
							
						 
						
							2019-06-04 14:58:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								1e7bb69a95 
								
							 
						 
						
							
							
								
								update ActivityPub#fetch_activities_query  
							
							
							
						 
						
							2019-06-04 15:21:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d3d1704e84 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/941  
							
							
							
						 
						
							2019-06-04 15:06:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0acfcf6c52 
								
							 
						 
						
							
							
								
								update ActivityPub#fetch_activities_query  
							
							
							
						 
						
							2019-06-04 15:04:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a3a7178b60 
								
							 
						 
						
							
							
								
								Participations: Filter out participations without activities.  
							
							
							
						 
						
							2019-06-04 13:58:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								0eb7464c10 
								
							 
						 
						
							
							
								
								Merge branch 'emoji-loader-fix' into 'develop'  
							
							... 
							
							
							
							Emoji: Don't die when files are present in the emoji folder.
Closes  #957 
See merge request pleroma/pleroma!1245  
							
						 
						
							2019-06-04 11:26:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8ac104cde0 
								
							 
						 
						
							
							
								
								Merge branch 'fix/fetch-votes-restrict-create' into 'develop'  
							
							... 
							
							
							
							Restrict `get_existing_votes` to only get Create activities
See merge request pleroma/pleroma!1244  
							
						 
						
							2019-06-04 10:55:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								bbff7554de 
								
							 
						 
						
							
							
								
								Add tests for get_existing_votes  
							
							
							
						 
						
							2019-06-04 13:47:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								17383861ed 
								
							 
						 
						
							
							
								
								Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities  
							
							
							
						 
						
							2019-06-04 13:38:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e74581a5c4 
								
							 
						 
						
							
							
								
								Emoji: Don't die when files are present in the emoji folder.  
							
							
							
						 
						
							2019-06-04 12:14:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								29b022bb59 
								
							 
						 
						
							
							
								
								Restrict get_existing_votes to only get Create activities  
							
							
							
						 
						
							2019-06-04 12:42:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								96121315f3 
								
							 
						 
						
							
							
								
								fix merge  
							
							
							
						 
						
							2019-06-04 12:41:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4cab98b7bf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into explicit-addressing  
							
							
							
						 
						
							2019-06-04 11:23:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								d977d73b91 
								
							 
						 
						
							
							
								
								Merge branch 'fix/poll-performance' into 'develop'  
							
							... 
							
							
							
							utils: access inReplyTo as an explicit string when fetching poll results`
See merge request pleroma/pleroma!1243  
							
						 
						
							2019-06-04 08:55:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								25198d48f7 
								
							 
						 
						
							
							
								
								Docs: Add Explicit addressing to Readme and changelog.  
							
							
							
						 
						
							2019-06-04 10:49:57 +02:00