Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								efb8ef5abe
								
							
						 | 
						
							
							
								
								releases support
							
							
							
							
							
						 | 
						
							2020-01-18 17:14:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e699861690
								
							
						 | 
						
							
							
								
								full update for some subkeys
							
							
							
							
							
						 | 
						
							2020-01-18 12:25:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								41c7f34905
								
							
						 | 
						
							
							
								
								short labels and fixes for typos
							
							
							
							
							
						 | 
						
							2020-01-14 15:00:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								70c7a26de8
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into admin-be
							
							
							
							
							
						 | 
						
							2020-01-14 14:52:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								6cc5341d26
								
							
						 | 
						
							
							
								
								Merge branch 'config/benchmark' into 'develop'
							
							
							
							
							
							
							
							Benchmark env uses test database so we should be able to use test.secret.exs
See merge request pleroma/pleroma!2057 
							
						 | 
						
							2020-01-12 18:31:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								0c9c62509d
								
							
						 | 
						
							
							
								
								Remove MDII uploader
							
							
							
							
							
						 | 
						
							2020-01-11 17:19:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7d128ca208
								
							
						 | 
						
							
							
								
								dynamic_configuration renaming
							
							
							
							
							
							
							
							and moving it from instance settings 
							
						 | 
						
							2020-01-10 19:34:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								00aff5f78c
								
							
						 | 
						
							
							
								
								syncing new setting to descriptions.exs
							
							
							
							
							
						 | 
						
							2020-01-10 17:54:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0b02040327
								
							
						 | 
						
							
							
								
								little fixes and typos fix
							
							
							
							
							
						 | 
						
							2020-01-10 15:52:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cda2c1fc63
								
							
						 | 
						
							
							
								
								fix for subgroup tuple
							
							
							
							
							
							
							
							added settings for swoosh adapters local 
							
						 | 
						
							2020-01-10 15:52:01 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f9d01068cf
								
							
						 | 
						
							
							
								
								suggestions fix
							
							
							
							
							
						 | 
						
							2020-01-10 15:52:01 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4306769671
								
							
						 | 
						
							
							
								
								adapter children
							
							
							
							
							
						 | 
						
							2020-01-10 15:52:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2753285b77
								
							
						 | 
						
							
							
								
								config editing through database
							
							
							
							
							
						 | 
						
							2020-01-10 15:51:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								89243fee8e
								
							
						 | 
						
							
							
								
								Fix captcha time, which was meant to be 5 minutes
							
							
							
							
							
						 | 
						
							2020-01-09 15:45:46 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b012e66e4e
								
							
						 | 
						
							
							
								
								Increase CAPTCHA expiration time to 5 minutes
							
							
							
							
							
						 | 
						
							2019-12-23 15:14:46 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								b7811dfb7b
								
							
						 | 
						
							
							
								
								Instead allow a dedicated benchmark config
							
							
							
							
							
						 | 
						
							2019-12-19 12:16:53 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								50638525db
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into config/benchmark
							
							
							
							
							
						 | 
						
							2019-12-19 12:16:33 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b9a87b1baa
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/custom-runtime-modules
							
							
							
							
							
						 | 
						
							2019-12-16 22:34:21 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								fc484e5ce6
								
							
						 | 
						
							
							
								
								Add Kocaptcha endpoint to config.exs
							
							
							
							
							
						 | 
						
							2019-12-16 19:35:10 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8d242f52d4
								
							
						 | 
						
							
							
								
								Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha"
							
							
							
							
							
							
							
							This reverts commit 82c62c5028. 
							
						 | 
						
							2019-12-16 19:33:51 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								82c62c5028
								
							
						 | 
						
							
							
								
								Add default endpoint to Pleroma.Captcha.Kocaptcha
							
							
							
							
							
						 | 
						
							2019-12-16 15:32:33 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								7528322f83
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/custom-runtime-modules
							
							
							
							
							
						 | 
						
							2019-12-13 01:51:52 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								470a3a678d
								
							
						 | 
						
							
							
								
								Add Kocaptcha endpoint to the test config
							
							
							
							
							
						 | 
						
							2019-12-12 18:04:52 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								e536796984
								
							
						 | 
						
							
							
								
								Add native captcha and enable it by default.
							
							
							
							
							
						 | 
						
							2019-12-12 17:39:39 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									stwf
								
							 
						 | 
						
							
							
							
							
								
							
							
								63ffa0e3ed
								
							
						 | 
						
							
							
								
								try local sheduling
							
							
							
							
							
						 | 
						
							2019-12-11 14:57:33 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								df469b4468
								
							
						 | 
						
							
							
								
								Benchmark env uses test database so we should be able to use test.secret.exs
							
							
							
							
							
						 | 
						
							2019-12-11 12:52:57 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								835ac2157c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 | 
						
							2019-12-10 08:55:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								c098dec473
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/custom-runtime-modules
							
							
							
							
							
						 | 
						
							2019-12-10 00:16:43 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed92784e7c
								
							
						 | 
						
							
							
								
								Set Logger level to :info in prod
							
							
							
							
							
						 | 
						
							2019-12-09 19:11:54 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								a75d4a41e0
								
							
						 | 
						
							
							
								
								Add a test for custom runtime modules
							
							
							
							
							
						 | 
						
							2019-12-06 17:05:09 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								157bceeda9
								
							
						 | 
						
							
							
								
								Move runtime configuration from :instance to :modules
							
							
							
							
							
						 | 
						
							2019-12-06 15:04:46 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								13926537b6
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
							
							
							
							
							
						 | 
						
							2019-12-06 00:26:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								af42c00cff
								
							
						 | 
						
							
							
								
								[#1427] Reworked admin scopes support.
							
							
							
							
							
							
							
							Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s). 
							
						 | 
						
							2019-12-06 00:25:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								48ae3c4347
								
							
						 | 
						
							
							
								
								Add support for custom modules
							
							
							
							
							
						 | 
						
							2019-12-05 20:18:25 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa97fe8f17
								
							
						 | 
						
							
							
								
								ChatChannel: Ignore messages that are too long.
							
							
							
							
							
						 | 
						
							2019-12-04 12:48:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								f673e3deef
								
							
						 | 
						
							
							
								
								Default log level for syslog in prod should also be :warn
							
							
							
							
							
						 | 
						
							2019-11-26 05:46:48 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3656c2725
								
							
						 | 
						
							
							
								
								add ability to set a custom user-agent string
							
							
							
							
							
						 | 
						
							2019-11-25 09:53:11 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								dedb1ad5d6
								
							
						 | 
						
							
							
								
								Merge branch 'revert-5c6c3026' into 'develop'
							
							
							
							
							
							
							
							Revert "Merge branch 'patch-1' into 'develop'"
See merge request pleroma/pleroma!2002 
							
						 | 
						
							2019-11-21 15:20:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								dc9303eac5
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'patch-1' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !1829 
							
						 | 
						
							2019-11-21 15:03:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								edaae845af
								
							
						 | 
						
							
							
								
								Some tasks try to set log level in test environment, but we were stripping logs belog :warn.
							
							
							
							
							
							
							
							Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose. 
							
						 | 
						
							2019-11-20 11:55:30 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								c65190c799
								
							
						 | 
						
							
							
								
								Console backend's log format should be prefixed and suffixed with newlines.
							
							
							
							
							
							
							
							This is how upstream does it by default. 
							
						 | 
						
							2019-11-20 11:18:42 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								1c17f18329
								
							
						 | 
						
							
							
								
								Be specific about format for logs in test as we have tests that check it
							
							
							
							
							
						 | 
						
							2019-11-20 09:14:27 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb513a599c
								
							
						 | 
						
							
							
								
								Allow test builds to have info and debug logs stripped
							
							
							
							
							
						 | 
						
							2019-11-19 16:21:30 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff9133b978
								
							
						 | 
						
							
							
								
								Allow mix tasks to always run with debug logging
							
							
							
							
							
						 | 
						
							2019-11-19 16:01:17 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d33eeca72
								
							
						 | 
						
							
							
								
								config: add configuration for MRF ObjectAgePolicy
							
							
							
							
							
						 | 
						
							2019-11-14 18:26:06 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								2cc043591c
								
							
						 | 
						
							
							
								
								Merge branch 'feature/static-fe' into 'develop'
							
							
							
							
							
							
							
							Static frontend
See merge request pleroma/pleroma!1917 
							
						 | 
						
							2019-11-11 19:10:44 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								72cc92259e
								
							
						 | 
						
							
							
								
								Default config: Use extended nickname format
							
							
							
							
							
						 | 
						
							2019-11-11 12:49:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								4499a7a075
								
							
						 | 
						
							
							
								
								Disable attachment links by default
							
							
							
							
							
							
							
							Closes #1394 
							
						 | 
						
							2019-11-10 15:02:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e08bd99bab
								
							
						 | 
						
							
							
								
								Apply suggestion to config/config.exs
							
							
							
							
							
						 | 
						
							2019-11-10 11:02:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4885d403fe
								
							
						 | 
						
							
							
								
								Apply suggestion to config/config.exs
							
							
							
							
							
						 | 
						
							2019-11-10 10:44:23 +00:00 | 
						
						
							
							
							
								
							
							
						 |