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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								bfec45bf74 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1601-add-new-meta-tag' into 'develop'  
							
							... 
							
							
							
							Restrict remote users from indexing
Closes  #1601 
See merge request pleroma/pleroma!2341  
							
						 
						
							2020-04-01 12:55:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								94ddbe4098 
								
							 
						 
						
							
							
								
								restrict remote users from indexing  
							
							
							
						 
						
							2020-04-01 09:57:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								185520d1b4 
								
							 
						 
						
							
							
								
								Provide known-good user.uri, remove User.profile_url/1  
							
							
							
						 
						
							2020-03-31 23:55:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b30fb1f3bb 
								
							 
						 
						
							
							
								
								User: Fix use of source_data in profile_url/1  
							
							
							
						 
						
							2020-03-31 23:54:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2553400a66 
								
							 
						 
						
							
							
								
								Initial failing test statement against funkwhale channels  
							
							
							
						 
						
							2020-03-31 23:54:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b607ae1a1c 
								
							 
						 
						
							
							
								
								removing grouped reports admin api endpoint  
							
							
							
						 
						
							2020-03-30 13:51:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								e999c67cee 
								
							 
						 
						
							
							
								
								Merge branch 'feature/funkwhale-audio' into 'develop'  
							
							... 
							
							
							
							Add support for funkwhale Audio activity
Closes  #764  and #1624 
See merge request pleroma/pleroma!2287  
							
						 
						
							2020-03-29 19:18:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								dfbc05d496 
								
							 
						 
						
							
							
								
								Misc refactoring / tweaks (ThreadMute.exists?/2).  
							
							
							
						 
						
							2020-03-27 08:01:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								112101ca52 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/thread_mute.ex 
							
						 
						
							2020-03-26 09:43:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								de62e633d3 
								
							 
						 
						
							
							
								
								Merge branch '1364-notifications-sending-control' into 'develop'  
							
							... 
							
							
							
							[#1364 ] Ability to opt-out of notifications (in all clients)
Closes  #1364 
See merge request pleroma/pleroma!2301  
							
						 
						
							2020-03-25 18:00:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ff1baae7e9 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering  
							
							
							
						 
						
							2020-03-25 20:41:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								460e41585c 
								
							 
						 
						
							
							
								
								Further preloading (more endpoints), refactoring, tests.  
							
							
							
						 
						
							2020-03-25 20:33:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9081a071ee 
								
							 
						 
						
							
							
								
								Add a test for accounts/update_credentials  
							
							
							
						 
						
							2020-03-25 18:46:17 +04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8f1d622b8d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering  
							
							
							
						 
						
							2020-03-24 22:15:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								13cbb9f6ad 
								
							 
						 
						
							
							
								
								Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).  
							
							
							
						 
						
							2020-03-24 22:14:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								8eebc75c15 
								
							 
						 
						
							
							
								
								Merge branch 'fix/activity-deletion' into 'develop'  
							
							... 
							
							
							
							Fix activity deletion
Closes  #1640 
See merge request pleroma/pleroma!2328  
							
						 
						
							2020-03-24 19:10:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1d75d0ed7a 
								
							 
						 
						
							
							
								
								Merge branch 'admin-api-change-password' into 'develop'  
							
							... 
							
							
							
							Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149  
							
						 
						
							2020-03-24 17:34:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1a9716a98 
								
							 
						 
						
							
							
								
								Fix activity deletion  
							
							
							
						 
						
							2020-03-24 17:38:18 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								eec1fcaf55 
								
							 
						 
						
							
							
								
								Home timeline tests: Add failing test for relationships  
							
							
							
						 
						
							2020-03-23 15:58:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								15be6ba9c2 
								
							 
						 
						
							
							
								
								AccountView: fix for other forms of <br> in bio  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643  
							
						 
						
							2020-03-22 16:41:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d74405fc1a 
								
							 
						 
						
							
							
								
								Merge branch 'fix-feed-pagination' into 'develop'  
							
							... 
							
							
							
							Fix for feed page pagination
Closes  #1605 
See merge request pleroma/pleroma!2281  
							
						 
						
							2020-03-20 16:57:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1c05f539aa 
								
							 
						 
						
							
							
								
								Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).  
							
							
							
						 
						
							2020-03-20 18:33:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0e27c274f4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements  
							
							... 
							
							
							
							# Conflicts:
#	test/web/mastodon_api/controllers/account_controller_test.exs 
							
						 
						
							2020-03-20 18:08:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fe15f0ba15 
								
							 
						 
						
							
							
								
								restrict_unauthenticated setting  
							
							
							
						 
						
							2020-03-20 16:36:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								98a60df41f 
								
							 
						 
						
							
							
								
								include_types parameter in /api/v1/notifications  
							
							
							
						 
						
							2020-03-20 13:18:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ec3719f539 
								
							 
						 
						
							
							
								
								Improved in-test config management functions.  
							
							
							
						 
						
							2020-03-18 20:30:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7438833685 
								
							 
						 
						
							
							
								
								[ #1364 ] Improved notification-related tests.  
							
							
							
						 
						
							2020-03-16 21:58:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								13cce9c0de 
								
							 
						 
						
							
							
								
								Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.  
							
							
							
						 
						
							2020-03-16 20:42:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								d198e7fa2a 
								
							 
						 
						
							
							
								
								Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password  
							
							
							
						 
						
							2020-03-16 20:32:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f3791add99 
								
							 
						 
						
							
							
								
								removing with_move parameter  
							
							
							
						 
						
							2020-03-16 20:07:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0e07c5ef57 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control  
							
							
							
						 
						
							2020-03-16 17:58:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dc2ec84c0f 
								
							 
						 
						
							
							
								
								warnings fix  
							
							
							
						 
						
							2020-03-16 14:19:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								89e4b3ebbd 
								
							 
						 
						
							
							
								
								fix for content-type header for tag feed  
							
							
							
						 
						
							2020-03-16 12:59:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								91870c8995 
								
							 
						 
						
							
							
								
								adding rss for user feed  
							
							
							
						 
						
							2020-03-16 12:45:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								26e2076659 
								
							 
						 
						
							
							
								
								fix for feed page pagination  
							
							
							
						 
						
							2020-03-16 12:33:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								34fd1c2c9d 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/earmark_renderer_test' into 'develop'  
							
							... 
							
							
							
							test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
See merge request pleroma/pleroma!2300  
							
						 
						
							2020-03-15 20:04:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								0ac6e29654 
								
							 
						 
						
							
							
								
								static_fe: Sanitize HTML in posts  
							
							... 
							
							
							
							Note: Seems to have different sanitization with TwitterCard generator giving
the following:
<meta content=\"“alert('xss')”\" property=\"twitter:description\"> 
							
						 
						
							2020-03-15 20:44:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fa4ec17c84 
								
							 
						 
						
							
							
								
								Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'  
							
							... 
							
							
							
							[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances
Closes  #1560 
See merge request pleroma/pleroma!2235  
							
						 
						
							2020-03-15 19:15:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7c8003c3fc 
								
							 
						 
						
							
							
								
								[ #1364 ] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.  
							
							
							
						 
						
							2020-03-15 21:00:12 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								dca21cd1d6 
								
							 
						 
						
							
							
								
								test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex  
							
							... 
							
							
							
							Wasn't in the test suite otherwise 
							
						 
						
							2020-03-15 17:07:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								67a27825b1 
								
							 
						 
						
							
							
								
								Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'  
							
							... 
							
							
							
							rate limiter: disable based on if remote ip was found, not on if the plug was enabled
Closes  #1620 
See merge request pleroma/pleroma!2296  
							
						 
						
							2020-03-15 14:22:10 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ecb7809e92 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/plugs/static_fe_plug.ex 
							
						 
						
							2020-03-14 15:37:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d88c8a9614 
								
							 
						 
						
							
							
								
								Merge branch 'fix/cache-control-headers' into 'develop'  
							
							... 
							
							
							
							Fix Cache Control headers on media
See merge request pleroma/pleroma!2295  
							
						 
						
							2020-03-14 11:19:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								994ac4357c 
								
							 
						 
						
							
							
								
								Merge branch 'fix/hashtags-streaming' into 'develop'  
							
							... 
							
							
							
							Fix hashtags WebSocket streaming
Closes  #1593 
See merge request pleroma/pleroma!2294  
							
						 
						
							2020-03-13 18:50:17 +00: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