Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								23219e6fb3 
								
							 
						 
						
							
							
								
								Add OpenAPI  
							
							
							
						 
						
							2020-04-01 23:13:08 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8bd5ad8664 
								
							 
						 
						
							
							
								
								Merge branch 'benchmark-improvements' into 'develop'  
							
							... 
							
							
							
							Benchmark improvements
See merge request pleroma/pleroma!2308  
							
						 
						
							2020-03-30 14:48:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b607ae1a1c 
								
							 
						 
						
							
							
								
								removing grouped reports admin api endpoint  
							
							
							
						 
						
							2020-03-30 13:51:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1f29ecdcd7 
								
							 
						 
						
							
							
								
								sync with develop  
							
							
							
						 
						
							2020-03-30 11:42:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eb9744cade 
								
							 
						 
						
							
							
								
								activities generation tasks  
							
							
							
						 
						
							2020-03-30 11:42:25 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								6b793d3f83 
								
							 
						 
						
							
							
								
								Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).  
							
							
							
						 
						
							2020-03-26 21:54:01 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								af820f8cf1 
								
							 
						 
						
							
							
								
								Merge branch 'benchmark_timeline' into 'develop'  
							
							... 
							
							
							
							Benchmarks: Add timeline benchmark
See merge request pleroma/pleroma!2325  
							
						 
						
							2020-03-25 18:06:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								460e41585c 
								
							 
						 
						
							
							
								
								Further preloading (more endpoints), refactoring, tests.  
							
							
							
						 
						
							2020-03-25 20:33:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								be5e2c4dbb 
								
							 
						 
						
							
							
								
								Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).  
							
							
							
						 
						
							2020-03-25 17:01:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3fa3d45dbe 
								
							 
						 
						
							
							
								
								[ #1364 ] Minor improvements / comments.  
							
							... 
							
							
							
							Further fixes of incorrect usage of "relations" as a short form of "relationships". 
							
						 
						
							2020-03-25 13:05:00 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fbf02a3722 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/profile-bio-newline' into 'develop'  
							
							... 
							
							
							
							AccountView: fix for other forms of <br> in bio
Closes  #1643 
See merge request pleroma/pleroma!2322  
							
						 
						
							2020-03-23 19:32:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3bd2829e5c 
								
							 
						 
						
							
							
								
								Benchmarks: Add timeline benchmark  
							
							
							
						 
						
							2020-03-23 18:56:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								86f2fbc81e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering  
							
							
							
						 
						
							2020-03-23 14:34:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a34dca8ed 
								
							 
						 
						
							
							
								
								Add emoji support in statuses in staticfe  
							
							
							
						 
						
							2020-03-23 14:03:31 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3c78e5f327 
								
							 
						 
						
							
							
								
								Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.  
							
							
							
						 
						
							2020-03-23 12:01:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c2e415143b 
								
							 
						 
						
							
							
								
								WIP: preloading of user relations for timeline/statuses rendering (performance improvement).  
							
							
							
						 
						
							2020-03-22 21:51:44 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								981e015f1b 
								
							 
						 
						
							
							
								
								Mastodon API Account view: Remove an outdated hack  
							
							... 
							
							
							
							The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary. 
							
						 
						
							2020-03-22 17:10:37 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								8176ca9e40 
								
							 
						 
						
							
							
								
								static_fe: Sanitize HTML in users  
							
							
							
						 
						
							2020-03-15 20:44:04 +01: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								8f7bc07ebc 
								
							 
						 
						
							
							
								
								pleroma_api_controller.ex: Improve conversations error reporting  
							
							... 
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1594  
							
						 
						
							2020-03-15 12:35:23 +01: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 
								
							 
						 
						
							
							
							
							
								
							
							
								6a28c198af 
								
							 
						 
						
							
							
								
								uploaded media plug: do not inject compile-time params on every request  
							
							
							
						 
						
							2020-03-13 22:12:33 +03:00