feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								2926713fe5
								
							
						 | 
						
							
							
								
								Merge branch 'deprecate-public_endpoint' into 'develop'
							
							
							
							
							
							
							
							Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251 
							
						 | 
						
							2021-01-20 22:48:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f
								
							
						 | 
						
							
							
								
								Bump Copyright to 2021
							
							
							
							
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;' 
							
						 | 
						
							2021-01-13 07:49:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								8b28dce82a
								
							
						 | 
						
							
							
								
								Deprecate Pleroma.Uploaders.S3, :public_endpoint
							
							
							
							
							
						 | 
						
							2021-01-12 16:31:35 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab633e51ab
								
							
						 | 
						
							
							
								
								Linting
							
							
							
							
							
						 | 
						
							2020-12-21 16:48:35 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5eef4988bf
								
							
						 | 
						
							
							
								
								fix for elixir 1.11
							
							
							
							
							
							
							
							load runtime configs in releases with config provider 
							
						 | 
						
							2020-11-25 14:10:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3cb9c88837
								
							
						 | 
						
							
							
								
								migration and warning for RemoteIp plug rename
							
							
							
							
							
						 | 
						
							2020-10-13 16:44:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0374df1d12
								
							
						 | 
						
							
							
								
								other files consistency
							
							
							
							
							
						 | 
						
							2020-10-13 16:38:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								8539e386c3
								
							
						 | 
						
							
							
								
								Add missing Copyright headers
							
							
							
							
							
						 | 
						
							2020-10-12 12:00:50 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								e2dcf039d2
								
							
						 | 
						
							
							
								
								Fix gun_pool_options deprecation warning message
							
							
							
							
							
						 | 
						
							2020-09-22 11:15:40 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2fc3b46ee7
								
							
						 | 
						
							
							
								
								Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1.
							
							
							
							
							
						 | 
						
							2020-09-22 11:13:36 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								e5927e92a6
								
							
						 | 
						
							
							
								
								Fix deprecation warning for welcome message
							
							
							
							
							
						 | 
						
							2020-09-21 17:08:49 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								f7e40f7ef1
								
							
						 | 
						
							
							
								
								Deny ConfigDB migration when deprecated settings found
							
							
							
							
							
						 | 
						
							2020-09-17 09:32:50 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f24828a3e8
								
							
						 | 
						
							
							
								
								oban warning
							
							
							
							
							
						 | 
						
							2020-09-10 21:51:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								629a8de9cb
								
							
						 | 
						
							
							
								
								deprecation warning
							
							
							
							
							
							
							
							changed namespace for activity expiration configuration 
							
						 | 
						
							2020-09-10 21:50:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8af1fd3223
								
							
						 | 
						
							
							
								
								oban warning
							
							
							
							
							
						 | 
						
							2020-09-10 16:01:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								18d21aed00
								
							
						 | 
						
							
							
								
								deprecation warnings
							
							
							
							
							
						 | 
						
							2020-09-07 19:59:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ee67c98e55
								
							
						 | 
						
							
							
								
								removing Stats worker from Oban cron jobs
							
							
							
							
							
						 | 
						
							2020-09-07 19:16:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0d5d1c62ef
								
							
						 | 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)
							
							
							
							
							
						 | 
						
							2020-07-27 12:24:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								61ef1fca4b
								
							
						 | 
						
							
							
								
								remove duplicate module
							
							
							
							
							
						 | 
						
							2020-07-24 08:35:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								67ab9a7928
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1934-welcome-email
							
							
							
							
							
						 | 
						
							2020-07-23 16:36:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7991ddad58
								
							
						 | 
						
							
							
								
								added warning to use old keys
							
							
							
							
							
						 | 
						
							2020-07-23 09:01:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b1eeb06d8
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !2784 
							
						 | 
						
							2020-07-21 22:18:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								696c13ce54
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'linkify' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !2677 
							
						 | 
						
							2020-07-21 22:17:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3edaecae96
								
							
						 | 
						
							
							
								
								added welcome email
							
							
							
							
							
						 | 
						
							2020-07-21 09:25:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								204dddcfaa
								
							
						 | 
						
							
							
								
								Pleroma.Formatter can have partial updates
							
							
							
							
							
						 | 
						
							2020-07-20 13:45:05 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								38425ebdbf
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into linkify
							
							
							
							
							
						 | 
						
							2020-07-16 14:51:36 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b376442325
								
							
						 | 
						
							
							
								
								MediaProxy whitelist setting now supports hosts with scheme
							
							
							
							
							
							
							
							added deprecation warning about using bare domains 
							
						 | 
						
							2020-07-12 12:41:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b28cc15459
								
							
						 | 
						
							
							
								
								don't restart pleroma in mix tasks
							
							
							
							
							
						 | 
						
							2020-07-08 15:58:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								480dfafa83
								
							
						 | 
						
							
							
								
								don't save tesla settings into db
							
							
							
							
							
						 | 
						
							2020-07-06 08:48:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8daacc9114
								
							
						 | 
						
							
							
								
								AutoLinker --> Linkify, update to latest version
							
							
							
							
							
							
							
							https://git.pleroma.social/pleroma/elixir-libraries/linkify 
							
						 | 
						
							2020-06-30 16:39:15 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7d69e9256
								
							
						 | 
						
							
							
								
								Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
							
							
							
							
							
							
							
							Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320 
							
						 | 
						
							2020-06-23 16:38:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b66e6eb521
								
							
						 | 
						
							
							
								
								fixes for tests
							
							
							
							
							
						 | 
						
							2020-06-16 19:03:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ed189568f3
								
							
						 | 
						
							
							
								
								moving mrf settings from instance to separate group
							
							
							
							
							
						 | 
						
							2020-06-16 18:32:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3c2cee33ad
								
							
						 | 
						
							
							
								
								moving custom ecto types in context folders
							
							
							
							
							
						 | 
						
							2020-06-16 17:50:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								32c6576b60
								
							
						 | 
						
							
							
								
								naming
							
							
							
							
							
						 | 
						
							2020-06-16 15:54:22 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e1603ac8fe
								
							
						 | 
						
							
							
								
								fix attemps to merge map
							
							
							
							
							
						 | 
						
							2020-06-16 15:54:22 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9a4fde9766
								
							
						 | 
						
							
							
								
								Mogrify args as custom tuples
							
							
							
							
							
						 | 
						
							2020-06-16 15:53:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb7be6eef2
								
							
						 | 
						
							
							
								
								Remove use of atoms in MRF.UserAllowListPolicy
							
							
							
							
							
						 | 
						
							2020-06-13 12:08:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3c29f4f957
								
							
						 | 
						
							
							
								
								returning partial chain
							
							
							
							
							
						 | 
						
							2020-05-15 16:16:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6cda360fea
								
							
						 | 
						
							
							
								
								don't restart postgrex
							
							
							
							
							
						 | 
						
							2020-04-17 12:45:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								304ea09f4c
								
							
						 | 
						
							
							
								
								fix for logger configuration
							
							
							
							
							
						 | 
						
							2020-04-17 08:42:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a050f3e015
								
							
						 | 
						
							
							
								
								fix for logger configuration through admin-fe
							
							
							
							
							
						 | 
						
							2020-04-13 08:56:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								39ed608b13
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into gun
							
							
							
							
							
						 | 
						
							2020-03-12 18:31:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1306b92997
								
							
						 | 
						
							
							
								
								clean up
							
							
							
							
							
						 | 
						
							2020-03-12 18:29:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								fce090c1de
								
							
						 | 
						
							
							
								
								using Pleroma.Config instead of ets
							
							
							
							
							
						 | 
						
							2020-03-11 17:22:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								193d67cde5
								
							
						 | 
						
							
							
								
								compile fix
							
							
							
							
							
						 | 
						
							2020-03-11 16:43:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								282a93554f
								
							
						 | 
						
							
							
								
								merging release default config on app start
							
							
							
							
							
						 | 
						
							2020-03-11 16:25:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								426f5ee48a
								
							
						 | 
						
							
							
								
								tesla adapter can't be changed in adminFE
							
							
							
							
							
						 | 
						
							2020-03-10 15:31:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b2eb1124d1
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into gun
							
							
							
							
							
						 | 
						
							2020-03-07 12:41:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								6d797b9928
								
							
						 | 
						
							
							
								
								Merge branch 'restart-fix-for-mix-tasks' into 'develop'
							
							
							
							
							
							
							
							Wait in mix task while pleroma is rebooted
See merge request pleroma/pleroma!2225 
							
						 | 
						
							2020-03-07 09:32:29 +00:00 | 
						
						
							
							
							
								
							
							
						 |