Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								4e6e5d8042 
								
							 
						 
						
							
							
								
								reverse proxy tests  
							
							
							
						 
						
							2019-07-09 16:54:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								1ab4e35f27 
								
							 
						 
						
							
							
								
								Merge branch 'enable-ogp-by-default' into 'develop'  
							
							... 
							
							
							
							Do not crash if metadata fails to render and enable OGP and TwitterCard by default
Closes  #1034 
See merge request pleroma/pleroma!1388  
							
						 
						
							2019-07-09 16:07:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								95c085174d 
								
							 
						 
						
							
							
								
								Merge branch 'test-speedup' into 'develop'  
							
							... 
							
							
							
							Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391  
							
						 
						
							2019-07-09 15:35:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								abe2e8881f 
								
							 
						 
						
							
							
								
								Testing: Don't federate in testing.  
							
							
							
						 
						
							2019-07-09 15:30:51 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								682f1897b7 
								
							 
						 
						
							
							
								
								Enable OpenGraph and TwitterCard by default  
							
							... 
							
							
							
							Closes  #1034  
						
							2019-07-08 13:00:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2b9d914089 
								
							 
						 
						
							
							
								
								[ #161 ] Refactoring, documentation.  
							
							
							
						 
						
							2019-06-30 15:58:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								620908a2db 
								
							 
						 
						
							
							
								
								[ #699 ] add worker to clean expired oauth tokens  
							
							
							
						 
						
							2019-05-22 15:44:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								714d8d4ef9 
								
							 
						 
						
							
							
								
								Merge branch 'feature/object-pruning' into 'develop'  
							
							... 
							
							
							
							Object pruning
See merge request pleroma/pleroma!1181  
							
						 
						
							2019-05-22 11:04:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								79c2cef2fb 
								
							 
						 
						
							
							
								
								Merge branch 'mongooseim-support' into 'develop'  
							
							... 
							
							
							
							MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172  
							
						 
						
							2019-05-22 04:06:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								16b260fb19 
								
							 
						 
						
							
							
								
								add mix task to prune the object database using a configured retention period  
							
							
							
						 
						
							2019-05-21 21:38:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								76a7429bef 
								
							 
						 
						
							
							
								
								Add poll limits to /api/v1/instance and initial state  
							
							
							
						 
						
							2019-05-21 09:13:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								75c7bb9289 
								
							 
						 
						
							
							
								
								Additional reserved usernames  
							
							
							
						 
						
							2019-05-20 17:18:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								daeae8e2e7 
								
							 
						 
						
							
							
								
								Move default mascot configuration to config/  
							
							
							
						 
						
							2019-05-20 16:12:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								2375e9a95b 
								
							 
						 
						
							
							
								
								Add report filtering to MRF.SimplePolicy  
							
							
							
						 
						
							2019-05-20 06:02:50 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								290f5b2cfe 
								
							 
						 
						
							
							
								
								config: make sending the user agent configurable, disable sending the user agent in tests  
							
							
							
						 
						
							2019-05-17 20:28:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8784a7d1b4 
								
							 
						 
						
							
							
								
								RUM: Set rum status by the environment.  
							
							
							
						 
						
							2019-05-17 15:21:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								412a3d8a0f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index  
							
							
							
						 
						
							2019-05-17 12:26:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								67af50ec71 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update  
							
							
							
						 
						
							2019-05-17 11:33:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e39c190f04 
								
							 
						 
						
							
							
								
								Configuration: disable migration lock.  
							
							
							
						 
						
							2019-05-17 11:30:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								aa11fa4864 
								
							 
						 
						
							
							
								
								add report uri and report to  
							
							
							
						 
						
							2019-05-16 12:49:40 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								4440e23547 
								
							 
						 
						
							
							
								
								Merge branch 'chore/extricate-http-signatures' into 'develop'  
							
							... 
							
							
							
							switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155  
							
						 
						
							2019-05-15 15:37:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								0992094bd6 
								
							 
						 
						
							
							
								
								Merge branch 'cleanup' into 'develop'  
							
							... 
							
							
							
							Remove unused queue from the config
See merge request pleroma/pleroma!1158  
							
						 
						
							2019-05-15 15:23:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f1e67bdc31 
								
							 
						 
						
							
							
								
								Search: Add optional rum indexing / searching.  
							
							
							
						 
						
							2019-05-15 15:28:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								153c15cdb2 
								
							 
						 
						
							
							
								
								Merge branch 'legacy-fe-config' into 'develop'  
							
							... 
							
							
							
							remove deprecated PleromaFE configuration
See merge request pleroma/pleroma!1152  
							
						 
						
							2019-05-15 10:56:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								ee22fff5ac 
								
							 
						 
						
							
							
								
								remove deprecated PleromaFE configuration  
							
							
							
						 
						
							2019-05-15 15:29:59 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								6c9f45f4dd 
								
							 
						 
						
							
							
								
								Remove unused queue from the config  
							
							
							
						 
						
							2019-05-15 14:40:20 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2ca8d20053 
								
							 
						 
						
							
							
								
								Fix rate-limiting tests  
							
							
							
						 
						
							2019-05-14 23:16:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								071f78733a 
								
							 
						 
						
							
							
								
								switch to pleroma/http_signatures library  
							
							
							
						 
						
							2019-05-14 20:03:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								38f3393e93 
								
							 
						 
						
							
							
								
								Make rate limiting for Mastodon Registration API less agressive and enable it by default.  
							
							... 
							
							
							
							As discussed on irc. Unlike Mastodon our web interface for registrations
is using the same APIs regular apps would be using, so 5 requests per 30
minutes per IP could hurt valid use-cases when Pleroma-FE switches to
it. Also enable the endpoint by default, it makes no sense to
have it disabled when
1. TwitterAPI endpoint is there and always enabled
2. Unlike Mastodon, there is no way to get an account without using the APIs (makes me wonder why the setting is even there)
Also in this commit: minor changelog improvements. 
							
						 
						
							2019-05-14 22:48:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5e2b491276 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-05-14 18:15:56 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								b14a314ce7 
								
							 
						 
						
							
							
								
								Merge branch 'feature/federator-behaviours' into 'develop'  
							
							... 
							
							
							
							federator modularization (outgoing)
See merge request pleroma/pleroma!1140  
							
						 
						
							2019-05-13 18:58:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a2be420f94 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: fullname & bio are optionnal  
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2019-05-13 18:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								fedaca15a3 
								
							 
						 
						
							
							
								
								websub: adapt to work as a federator publishing module  
							
							
							
						 
						
							2019-05-12 05:04:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								179293e51c 
								
							 
						 
						
							
							
								
								salmon: refactor to work as a federator publishing module  
							
							
							
						 
						
							2019-05-12 05:04:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								10695a28d2 
								
							 
						 
						
							
							
								
								federator: publisher: add publish() wrapper  
							
							
							
						 
						
							2019-05-12 05:04:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b6b5b16ba4 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-05-08 17:08:06 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1557b99beb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-05-07 16:51:11 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								f46295faa7 
								
							 
						 
						
							
							
								
								unused config paramater  
							
							
							
						 
						
							2019-05-07 09:07:06 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								1040caf096 
								
							 
						 
						
							
							
								
								fix format  
							
							... 
							
							
							
							Modified-by: Maksim Pechnikov <parallel588@gmail.com> 
							
						 
						
							2019-05-06 17:51:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								aacac9da0b 
								
							 
						 
						
							
							
								
								Merge branch 'feature/bbs' into 'develop'  
							
							... 
							
							
							
							BBS / SSH
See merge request pleroma/pleroma!997  
							
						 
						
							2019-05-06 17:17:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								ce6ca0fefe 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into feature/845-improve-status-deletion  
							
							
							
						 
						
							2019-05-06 16:45:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6ad8ddfd29 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into feature/bbs  
							
							
							
						 
						
							2019-05-04 15:00:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0f0cc2703b 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-04-30 20:17:52 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								501af917b5 
								
							 
						 
						
							
							
								
								add support for bbcode  
							
							
							
						 
						
							2019-04-26 22:35:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								24c3e2db2c 
								
							 
						 
						
							
							
								
								Add mediaproxy whitelist capability  
							
							
							
						 
						
							2019-04-25 18:11:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								c157e27a00 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/disable-account  
							
							
							
						 
						
							2019-04-25 13:41:10 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								d35246c449 
								
							 
						 
						
							
							
								
								added healthcheck setting to instance config  
							
							
							
						 
						
							2019-04-22 17:00:06 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e8c2f9a73a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-04-22 13:08:30 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								0d6265cfe2 
								
							 
						 
						
							
							
								
								Change the default manifest to pleroma's namespace  
							
							
							
						 
						
							2019-04-21 22:32:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b87ad13803 
								
							 
						 
						
							
							
								
								Move comments for email_notifications config to docs  
							
							
							
						 
						
							2019-04-21 19:36:31 +07:00