Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								657277ffc0 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							
							
						 
						
							2019-06-29 00:52:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f8ec3e129f 
								
							 
						 
						
							
							
								
								In my experience syslog tags are usually lowercase  
							
							
							
						 
						
							2019-06-27 13:00:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9f8e645dce 
								
							 
						 
						
							
							
								
								Merge branch 'feature/configurable-pack-extensions' into 'develop'  
							
							... 
							
							
							
							Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338  
							
						 
						
							2019-06-26 05:34:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								41e4752950 
								
							 
						 
						
							
							
								
								Make default pack extensions configurable and default to png and gif  
							
							
							
						 
						
							2019-06-26 06:48:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4ad15ad2a9 
								
							 
						 
						
							
							
								
								add ignore hosts and TLDs for rich_media  
							
							
							
						 
						
							2019-06-25 22:25:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								875100de01 
								
							 
						 
						
							
							
								
								Bind to 127.0.0.1 instead of 0.0.0.0 by default  
							
							
							
						 
						
							2019-06-23 09:31:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								32320c1ee9 
								
							 
						 
						
							
							
								
								Fixes for dynamic configuration  
							
							
							
						 
						
							2019-06-20 17:43:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f30a3241d2 
								
							 
						 
						
							
							
								
								Deps: Update auto_linker  
							
							
							
						 
						
							2019-06-18 16:08:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								c2ca1f22a2 
								
							 
						 
						
							
							
								
								it is changed in compile time  
							
							... 
							
							
							
							we can't change module attributes and endpoint settings in runtime 
							
						 
						
							2019-06-14 15:45:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								ce823fa88e 
								
							 
						 
						
							
							
								
								Fix rate limit test  
							
							
							
						 
						
							2019-06-14 19:24:31 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ac3d43e620 
								
							 
						 
						
							
							
								
								Set instance static/uploads to be outside of application directory in release config  
							
							... 
							
							
							
							In case of releases the application directory changes with each version
so the contents will not be accessible 
							
						 
						
							2019-06-14 01:42:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								822a9f28d0 
								
							 
						 
						
							
							
								
								Merge branch 'release-config-import' into 'develop'  
							
							... 
							
							
							
							Import release config from env variable or /etc/pleroma/config.exs and warn if the file is missing
See merge request pleroma/pleroma!1269  
							
						 
						
							2019-06-12 09:58:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f0d96534a4 
								
							 
						 
						
							
							
								
								Import release config from env variable or /etc/pleroma/config.exs and  
							
							... 
							
							
							
							warn if the file is missing 
							
						 
						
							2019-06-11 18:55:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								6f29865d43 
								
							 
						 
						
							
							
								
								Add option to restrict all users to local content  
							
							
							
						 
						
							2019-06-11 21:25:53 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								5d5a9a3a35 
								
							 
						 
						
							
							
								
								Better default parameters for suggestion  
							
							
							
						 
						
							2019-06-11 11:34:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								63ab3c30eb 
								
							 
						 
						
							
							
								
								Merge branch 'feature/rate-limiter' into 'develop'  
							
							... 
							
							
							
							Feature/Rate Limiter
Closes  #943 
See merge request pleroma/pleroma!1266  
							
						 
						
							2019-06-11 11:32:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								ad04d12de6 
								
							 
						 
						
							
							
								
								Replace MastodonAPIController.account_register/2 rate limiter  
							
							
							
						 
						
							2019-06-11 16:06:03 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								bc8f059367 
								
							 
						 
						
							
							
								
								Add rate limiting for search endpoints  
							
							
							
						 
						
							2019-06-11 14:28:39 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e343e4ff91 
								
							 
						 
						
							
							
								
								Merge branch 'change-containment-default' into 'develop'  
							
							... 
							
							
							
							Configuration: Skip thread containment by default
See merge request pleroma/pleroma!1256  
							
						 
						
							2019-06-11 02:38:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3ecfe2a6d4 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/releases  
							
							
							
						 
						
							2019-06-09 13:55:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b6d2db42a7 
								
							 
						 
						
							
							
								
								Fix wrong placement of serve_endpoints  
							
							
							
						 
						
							2019-06-08 21:27:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4f5149c93b 
								
							 
						 
						
							
							
								
								Set default loglevel to warn in prod  
							
							... 
							
							
							
							It's rare that info logs are needed to debug the issue, so I would
suggest setting them to warn in prod by default to make finding the
relevant parts easier and potentially even decrease cpu usage on bigger
instances
Closes  #962  
							
						 
						
							2019-06-08 18:02:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4b98a7ce4e 
								
							 
						 
						
							
							
								
								Set serve_endpoints to true in prod config as setting it in runtime  
							
							... 
							
							
							
							config would cause issues with mix tasks 
							
						 
						
							2019-06-08 17:17:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3d374bf7df 
								
							 
						 
						
							
							
								
								Basic release skeleton  
							
							
							
						 
						
							2019-06-08 17:16:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								76fc4c92bb 
								
							 
						 
						
							
							
								
								Fix tests.  
							
							
							
						 
						
							2019-06-07 17:16:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c0fa000147 
								
							 
						 
						
							
							
								
								Set default config for digest to false  
							
							
							
						 
						
							2019-06-07 01:22:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								01fe5abad1 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							
							
						 
						
							2019-06-07 01:20:50 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								f82382de22 
								
							 
						 
						
							
							
								
								[ #943 ] Make the unauthenticated users limitation optional  
							
							
							
						 
						
							2019-06-06 12:17:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3eefb274f4 
								
							 
						 
						
							
							
								
								OAuth consumer: tests fix, comments, Keycloak config notes.  
							
							
							
						 
						
							2019-06-05 13:02:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b1b1a270e8 
								
							 
						 
						
							
							
								
								Fix conflict  
							
							
							
						 
						
							2019-06-05 02:45:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4f2e359687 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/941  
							
							
							
						 
						
							2019-06-04 09:49:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9f0d0d0805 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mrf-subchain' into 'develop'  
							
							... 
							
							
							
							MRF: subchain policy
See merge request pleroma/pleroma!1233  
							
						 
						
							2019-06-04 05:49:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								a536f515dd 
								
							 
						 
						
							
							
								
								Merge branch 'ueberauth_config_extension' into 'develop'  
							
							... 
							
							
							
							Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification
See merge request pleroma/pleroma!1234  
							
						 
						
							2019-06-04 05:42:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								bd325132ca 
								
							 
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2019-06-04 03:07:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6ef145b4fc 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-06-03 15:29:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								080e1aa70e 
								
							 
						 
						
							
							
								
								add option skip_thread_containment  
							
							
							
						 
						
							2019-06-03 16:13:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								026b245dbc 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/polls-2-electric-boogalo  
							
							
							
						 
						
							2019-06-03 11:14:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								83663caa81 
								
							 
						 
						
							
							
								
								Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.  
							
							
							
						 
						
							2019-06-02 17:45:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								561a21986d 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2019-06-02 10:29:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4087ccdab8 
								
							 
						 
						
							
							
								
								mrf: add subchain policy  
							
							
							
						 
						
							2019-06-02 10:07:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								65db5e9f52 
								
							 
						 
						
							
							
								
								Resolve merge conflicts  
							
							
							
						 
						
							2019-06-01 16:29:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								f1890d2cac 
								
							 
						 
						
							
							
								
								Merge branch 'dokku' into 'develop'  
							
							... 
							
							
							
							Dokku CI support - On-Demand review instances
See merge request pleroma/pleroma!1216  
							
						 
						
							2019-05-31 23:09:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4e45f7bc87 
								
							 
						 
						
							
							
								
								CI: Add auto-deployment via dokku.  
							
							
							
						 
						
							2019-05-31 10:55:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ce47017c89 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-05-29 18:18:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								56fd7dbdd7 
								
							 
						 
						
							
							
								
								remove @websub and @ostatus module-level constants  
							
							
							
						 
						
							2019-05-25 04:43:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								80d55d428f 
								
							 
						 
						
							
							
								
								tests: websub: check only that signature validation succeeds or fails  
							
							
							
						 
						
							2019-05-25 04:34:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9bec891eb4 
								
							 
						 
						
							
							
								
								kill @httpoison  
							
							
							
						 
						
							2019-05-25 04:24:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								baf72d6c58 
								
							 
						 
						
							
							
								
								mrf: simple policy: add the ability to strip avatars and banners from user profiles  
							
							
							
						 
						
							2019-05-22 18:53:12 +00:00