Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								a5dce42c85 
								
							 
						 
						
							
							
								
								Merge branch 'chore/rename-chat' into 'develop'  
							
							 
							
							... 
							
							
							
							Rename the non-federating Chat feature to Shout
See merge request pleroma/pleroma!2842  
							
						 
						
							2021-06-03 15:52:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								679d4c23e9 
								
							 
						 
						
							
							
								
								Update wording for relays in docs and config description  
							
							 
							
							
							
						 
						
							2021-06-02 11:30:09 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								297feb73f4 
								
							 
						 
						
							
							
								
								Formatting  
							
							 
							
							
							
						 
						
							2021-06-02 11:21:04 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								dcf84ac12e 
								
							 
						 
						
							
							
								
								disableChat / disableShout didn't actually do anything for PleromaFE  
							
							 
							
							
							
						 
						
							2021-06-01 16:53:32 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8ff2d8d17d 
								
							 
						 
						
							
							
								
								Update description file for new shout config setting location  
							
							 
							
							
							
						 
						
							2021-06-01 11:49:47 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d6432a65da 
								
							 
						 
						
							
							
								
								Move shout configuration from :instance, update docs and changelog  
							
							 
							
							
							
						 
						
							2021-06-01 11:49:46 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								36fe8950f7 
								
							 
						 
						
							
							
								
								Update PleromaFE settings for the old chat box  
							
							 
							
							
							
						 
						
							2021-06-01 11:49:16 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								68aa56b9e4 
								
							 
						 
						
							
							
								
								Just call it shout  
							
							 
							
							
							
						 
						
							2021-06-01 11:49:16 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ff00b354fa 
								
							 
						 
						
							
							
								
								Rename the non-federating Chat feature to Shout  
							
							 
							
							
							
						 
						
							2021-06-01 11:49:14 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Snow 
								
							 
						 
						
							
							
							
							
								
							
							
								69aed310de 
								
							 
						 
						
							
							
								
								Adding description  
							
							 
							
							
							
						 
						
							2021-05-29 02:22:33 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								a833a2d76b 
								
							 
						 
						
							
							
								
								Merge branch 'plug-runtime-dev' into 'develop'  
							
							 
							
							... 
							
							
							
							Put Plugs in runtime mode in :dev, :test to speed up recompilation
See merge request pleroma/pleroma!3411  
							
						 
						
							2021-05-28 18:57:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fe40f6f291 
								
							 
						 
						
							
							
								
								Switch from the deprecated "use Mix.config" to "import Config"  
							
							 
							
							
							
						 
						
							2021-05-20 14:02:58 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0461794375 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev  
							
							 
							
							
							
						 
						
							2021-05-19 14:27:59 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e3173a279d 
								
							 
						 
						
							
							
								
								Put Plugs in runtime mode in :dev, :test to speed up recompilation  
							
							 
							
							
							
						 
						
							2021-05-19 14:27:46 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								32ae8f4906 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into optional-config  
							
							 
							
							
							
						 
						
							2021-05-16 12:27:29 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b22f54eb29 
								
							 
						 
						
							
							
								
								Make prod.secret.exs optional (with warning)  
							
							 
							
							
							
						 
						
							2021-05-16 12:26:32 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2557e805a3 
								
							 
						 
						
							
							
								
								Support for configuration via AdminFE  
							
							 
							
							
							
						 
						
							2021-03-30 11:10:43 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8b81d62227 
								
							 
						 
						
							
							
								
								Upstream original followbot implementation  
							
							 
							
							
							
						 
						
							2021-03-30 11:10:03 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f930e83fa2 
								
							 
						 
						
							
							
								
								Merge branch 'fix/remove_auto_nsfw' into 'develop'  
							
							 
							
							... 
							
							
							
							Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223  
							
						 
						
							2021-03-19 08:48:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								882dd46843 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							
							
						 
						
							2021-03-02 08:26:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3bc7d12271 
								
							 
						 
						
							
							
								
								Remove sensitive-property setting #nsfw, create HashtagPolicy  
							
							 
							
							
							
						 
						
							2021-02-27 21:26:17 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8f88a90ca3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/config.ex 
							
						 
						
							2021-02-23 13:58:35 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								77f3da0358 
								
							 
						 
						
							
							
								
								[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.  
							
							 
							
							
							
						 
						
							2021-02-23 13:52:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a98c4423f3 
								
							 
						 
						
							
							
								
								Apply i1t's suggestion(s) to 1 file(s)  
							
							 
							
							
							
						 
						
							2021-02-22 20:41:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								db7d6f337f 
								
							 
						 
						
							
							
								
								Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote  
							
							 
							
							
							
						 
						
							2021-02-19 18:37:37 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b981edad8a 
								
							 
						 
						
							
							
								
								[ #3213 ] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.  
							
							 
							
							
							
						 
						
							2021-02-18 20:40:10 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6d66fadea7 
								
							 
						 
						
							
							
								
								Remove :auth, :enforce_oauth_admin_scope_usage  
							
							 
							
							... 
							
							
							
							`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now. 
							
						 
						
							2021-02-17 20:47:38 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								349b8b0f4f 
								
							 
						 
						
							
							
								
								[ #3213 ] rescue around potentially-raising Repo.insert_all/_ calls. Misc. improvements (docs etc.).  
							
							 
							
							
							
						 
						
							2021-02-13 22:01:11 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								5992382cf8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/mix/tasks/pleroma/database.ex
#	lib/pleroma/web/templates/feed/feed/_activity.rss.eex 
							
						 
						
							2021-02-11 19:31:57 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a996ab46a5 
								
							 
						 
						
							
							
								
								[ #3213 ] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.  
							
							 
							
							
							
						 
						
							2021-02-11 19:30:21 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a52cedba62 
								
							 
						 
						
							
							
								
								Merge branch 'chore/descriptions-improvements' into 'develop'  
							
							 
							
							... 
							
							
							
							More descriptions improvements
See merge request pleroma/pleroma!3307  
							
						 
						
							2021-02-08 19:21:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ce7c275fb3 
								
							 
						 
						
							
							
								
								Improve various descriptions and labels  
							
							 
							
							
							
						 
						
							2021-02-08 11:45:50 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2bffa8e020 
								
							 
						 
						
							
							
								
								Make the suggestion match the default value  
							
							 
							
							
							
						 
						
							2021-02-08 11:25:32 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4dbb08a19f 
								
							 
						 
						
							
							
								
								Improved Mailer descriptions  
							
							 
							
							
							
						 
						
							2021-02-08 10:08:33 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d1c6dd97aa 
								
							 
						 
						
							
							
								
								[ #3213 ] Partially addressed code review points.  
							
							 
							
							... 
							
							
							
							migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused). 
							
						 
						
							2021-02-07 22:24:12 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f736501e97 
								
							 
						 
						
							
							
								
								Alpha-sort adapters  
							
							 
							
							... 
							
							
							
							Add various labels, descriptions and suggestions for all adapter settings and try to use
the same terminology by the service provider. 
							
						 
						
							2021-02-06 13:18:48 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0fcf16dcb8 
								
							 
						 
						
							
							
								
								Move Enabled to top as it's the master control of all email. Description not really needed.  
							
							 
							
							
							
						 
						
							2021-02-06 12:34:32 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								bd828e5c9c 
								
							 
						 
						
							
							
								
								More description improvements  
							
							 
							
							
							
						 
						
							2021-02-06 12:28:49 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								227dd84f11 
								
							 
						 
						
							
							
								
								Update SMTP error description and default value  
							
							 
							
							
							
						 
						
							2021-02-06 12:06:47 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9e3e8e2e30 
								
							 
						 
						
							
							
								
								Update Swoosh docs URL, lint  
							
							 
							
							
							
						 
						
							2021-02-06 12:04:28 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								cfc474c5f7 
								
							 
						 
						
							
							
								
								There is no reason to expose these Local adapter settings either.  
							
							 
							
							
							
						 
						
							2021-02-06 12:01:11 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6ffe15cc9f 
								
							 
						 
						
							
							
								
								Remove No MX lookups setting  
							
							 
							
							... 
							
							
							
							This setting defaults to false so the relay host will be used in an MX query so
multiple SMTP servers can be used. gen_smtp code states that all records returned from the
MX query are attempted in order and only a permanent SMTP error will stop the client from
attempting other servers in the list. Connection failures, TLS issues, etc will cause it to
try the next host.
If there is no MX record associated with the relay host, it automatically tries connecting to it
directly.
There is really no reason to expose this to end users. The default value is fine for everyone. 
							
						 
						
							2021-02-06 11:55:25 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								85710b026f 
								
							 
						 
						
							
							
								
								Improve SMTP adapter setting descriptions  
							
							 
							
							
							
						 
						
							2021-02-06 11:55:01 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9f98885388 
								
							 
						 
						
							
							
								
								No reason to suggest users try the useless "Local" mail adapter  
							
							 
							
							
							
						 
						
							2021-02-06 11:28:55 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								887db076b5 
								
							 
						 
						
							
							
								
								Load an emoji.txt specific to the test env  
							
							 
							
							
							
						 
						
							2021-02-03 16:40:59 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								008499f65a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/2412-filters'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2021-02-03 14:23:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1b49b8efe5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2021-01-31 20:38:58 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6fd4163ab6 
								
							 
						 
						
							
							
								
								[ #3213 ] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.  
							
							 
							
							
							
						 
						
							2021-01-31 20:37:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9948ff3356 
								
							 
						 
						
							
							
								
								[ #3213 ] Added HashtagsCleanupWorker periodic job.  
							
							 
							
							
							
						 
						
							2021-01-31 18:24:19 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2048b93929 
								
							 
						 
						
							
							
								
								Add missing :ex_aws, :s3, :region setting  
							
							 
							
							
							
						 
						
							2021-01-29 11:31:15 -06:00