Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bedc558809 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into accept-deletes  
							
							
							
						 
						
							2020-04-20 10:15:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b54c8813d6 
								
							 
						 
						
							
							
								
								Add :reject_deletes option to SimplePolicy  
							
							
							
						 
						
							2020-04-20 10:11:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6e6f95c6ae 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-04-17 16:23:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								5c76afb06c 
								
							 
						 
						
							
							
								
								[ #2342 ] Removed description.exs entry for temporary configuration option.  
							
							
							
						 
						
							2020-04-13 15:38:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1a4875adfa 
								
							 
						 
						
							
							
								
								[ #1559 ] Support for "follow_request" notifications (configurable).  
							
							... 
							
							
							
							(Not currently supported by PleromaFE, thus disabled by default). 
							
						 
						
							2020-04-07 21:52:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								98b96e45ab 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-04-01 20:08:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								ef7d2b0f11 
								
							 
						 
						
							
							
								
								Merge branch 'gun' into 'develop'  
							
							... 
							
							
							
							Gun adapter
Closes  #945 
See merge request pleroma/pleroma!1861  
							
						 
						
							2020-04-01 17:05:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2f2bd7fe72 
								
							 
						 
						
							
							
								
								Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.  
							
							... 
							
							
							
							See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param. 
							
						 
						
							2020-04-01 19:49:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f497cf2f7c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-30 12:15:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eb9744cade 
								
							 
						 
						
							
							
								
								activities generation tasks  
							
							
							
						 
						
							2020-03-30 11:42:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								012d428e1f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control  
							
							
							
						 
						
							2020-03-25 09:05:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e743c22329 
								
							 
						 
						
							
							
								
								Fixed incorrect usage of "relations" as a short form of "relationships".  
							
							
							
						 
						
							2020-03-25 09:04:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9bae9b1b1b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-20 20:47:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fe15f0ba15 
								
							 
						 
						
							
							
								
								restrict_unauthenticated setting  
							
							
							
						 
						
							2020-03-20 16:36:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b17d8d305f 
								
							 
						 
						
							
							
								
								Enable Gun adapter by default  
							
							... 
							
							
							
							We need devs to dogfood this before we merge it into the 2.1 release 
							
						 
						
							2020-03-16 15:39:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0651730bd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-16 14:25:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ba90a6d3e5 
								
							 
						 
						
							
							
								
								removing from descriptions.exs deprecated settings  
							
							
							
						 
						
							2020-03-16 14:01:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								d84670b9e1 
								
							 
						 
						
							
							
								
								Merge branch 'f' into 'develop'  
							
							... 
							
							
							
							rip out fetch_initial_posts
Closes  #1422  and #1595 
See merge request pleroma/pleroma!2297  
							
						 
						
							2020-03-15 16:14:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e87a32bcd7 
								
							 
						 
						
							
							
								
								rip out fetch_initial_posts  
							
							... 
							
							
							
							Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes  #1595  #1422  
							
						 
						
							2020-03-15 15:59:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fc4496d4fa 
								
							 
						 
						
							
							
								
								rate limiter: disable based on if remote ip was found, not on if the plug was enabled  
							
							... 
							
							
							
							The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable  when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.
Also closes  #1620  
							
						 
						
							2020-03-13 21:41:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b34bc669b9 
								
							 
						 
						
							
							
								
								adding descriptions  
							
							
							
						 
						
							2020-03-04 20:09:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								884d9710b2 
								
							 
						 
						
							
							
								
								refactoring for gun api modules  
							
							
							
						 
						
							2020-03-03 19:24:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8854770fc4 
								
							 
						 
						
							
							
								
								retry and retry_timeout settings default change  
							
							
							
						 
						
							2020-03-03 18:01:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								28ed4b41d0 
								
							 
						 
						
							
							
								
								naming for checkin from pool timeout  
							
							
							
						 
						
							2020-03-03 13:05:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								509c81e4b1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-03 10:08:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4c02e04935 
								
							 
						 
						
							
							
								
								Merge branch 'prepared-statements-settings' into 'develop'  
							
							... 
							
							
							
							Prepared statements settings
See merge request pleroma/pleroma!2238  
							
						 
						
							2020-03-02 17:00:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2622cf1190 
								
							 
						 
						
							
							
								
								returning repo parameters  
							
							
							
						 
						
							2020-03-02 09:22:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d9e4b77f8b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-01 12:48:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ffcebe7e22 
								
							 
						 
						
							
							
								
								timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user  
							
							
							
						 
						
							2020-03-01 01:13:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								19e559fe51 
								
							 
						 
						
							
							
								
								Merge branch 'rate-limiter-runtime-settings' into 'develop'  
							
							... 
							
							
							
							RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250  
							
						 
						
							2020-02-29 21:52:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								814b275af7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-02-29 11:34:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								04b03e4762 
								
							 
						 
						
							
							
								
								streamer group & Oban crontab child  
							
							
							
						 
						
							2020-02-29 11:26:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								fabcd82f4a 
								
							 
						 
						
							
							
								
								add confirm field to filtered params  
							
							
							
						 
						
							2020-02-28 04:27:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6f2efb1c45 
								
							 
						 
						
							
							
								
								Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.  
							
							
							
						 
						
							2020-02-27 18:46:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2076c9f8c8 
								
							 
						 
						
							
							
								
								unnecessary groups  
							
							
							
						 
						
							2020-02-26 19:50:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f71aa644b1 
								
							 
						 
						
							
							
								
								Add :unnamed option to default database configuration  
							
							
							
						 
						
							2020-02-25 11:53:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								1e1156b645 
								
							 
						 
						
							
							
								
								Merge branch '1505-threads-federation' into 'develop'  
							
							... 
							
							
							
							[#1505 ] Threads / replies federation
Closes  #1505 
See merge request pleroma/pleroma!2129  
							
						 
						
							2020-02-24 07:28:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9fe60c3b9c 
								
							 
						 
						
							
							
								
								Add missing invites_enabled and account_activation_required settings  
							
							
							
						 
						
							2020-02-22 09:29:05 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8f0ca19b9c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	config/config.exs 
							
						 
						
							2020-02-22 09:31:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a03c420b84 
								
							 
						 
						
							
							
								
								by default don't use gun retries  
							
							... 
							
							
							
							remove conn depends on retry setting from config 
							
						 
						
							2020-02-21 12:32:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								13918cb545 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-02-21 10:02:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b6bb73f43e 
								
							 
						 
						
							
							
								
								Apply database session parameter to improve GIN full text search  
							
							
							
						 
						
							2020-02-20 15:34:10 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0d14c3f410 
								
							 
						 
						
							
							
								
								[ #1505 ] Typo fix.  
							
							
							
						 
						
							2020-02-20 15:18:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3eddd9caa6 
								
							 
						 
						
							
							
								
								Merge branch 'require-signature' into 'develop'  
							
							... 
							
							
							
							Add an option to require fetches to be signed
Closes  #1444 
See merge request pleroma/pleroma!2071  
							
						 
						
							2020-02-20 12:13:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0c65a8c3d0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation  
							
							... 
							
							
							
							# Conflicts:
#	config/config.exs 
							
						 
						
							2020-02-20 15:00:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e0b2de6385 
								
							 
						 
						
							
							
								
								Merge branch 'feature/new-registrations-digest' into 'develop'  
							
							... 
							
							
							
							New users digest email
Closes  #1514 
See merge request pleroma/pleroma!2128  
							
						 
						
							2020-02-20 11:58:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								61d9f43e46 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation  
							
							
							
						 
						
							2020-02-18 17:46:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								514c899275 
								
							 
						 
						
							
							
								
								adding gun adapter  
							
							
							
						 
						
							2020-02-18 08:19:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								269d592181 
								
							 
						 
						
							
							
								
								[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).  
							
							
							
						 
						
							2020-02-15 20:41:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0afff36cda 
								
							 
						 
						
							
							
								
								Formatting got me again  
							
							
							
						 
						
							2020-02-13 12:09:11 -06:00