Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9d4f34fbcb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-08-02 18:16:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								51b3b6d816 
								
							 
						 
						
							
							
								
								Admin changes  
							
							
							
						 
						
							2019-07-30 16:36:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								c0e258cf21 
								
							 
						 
						
							
							
								
								Redirect not logged-in users to the MastoFE login page on private instances  
							
							
							
						 
						
							2019-07-29 16:17:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								242f5c585e 
								
							 
						 
						
							
							
								
								add account confirmation email resend in mastodon api  
							
							
							
						 
						
							2019-07-28 20:30:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								6b77a88365 
								
							 
						 
						
							
							
								
								[ #1097 ] added redirect: /pleroma/admin -> /pleroma/admin/  
							
							
							
						 
						
							2019-07-26 20:27:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d2da3d30f3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-07-24 16:37:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								f46805bb40 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-user-statuses  
							
							
							
						 
						
							2019-07-24 02:42:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								90be91b0e0 
								
							 
						 
						
							
							
								
								Router: Remove deprecated AdminAPI endpoints  
							
							
							
						 
						
							2019-07-23 21:35:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								bc6c5c513a 
								
							 
						 
						
							
							
								
								router: ensure the AP sharedinbox path is registered first  
							
							
							
						 
						
							2019-07-21 03:52:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								36049f08ef 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-07-20 01:03:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								9570a5be40 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-user-statuses  
							
							
							
						 
						
							2019-07-18 23:38:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								184fa61fb3 
								
							 
						 
						
							
							
								
								plugs: add MappedSignatureToIdentityPlug  
							
							
							
						 
						
							2019-07-18 15:38:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								cf9cb953d5 
								
							 
						 
						
							
							
								
								activitypub: represent internal fetch actor  
							
							
							
						 
						
							2019-07-17 17:34:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								10f82c88b8 
								
							 
						 
						
							
							
								
								mastoapi password reset  
							
							... 
							
							
							
							added rate limit to password reset
configure rate limit in runtime 
							
						 
						
							2019-07-16 21:44:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c729883936 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-07-14 21:43:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								418ae6638d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-user-statuses  
							
							
							
						 
						
							2019-07-14 00:39:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								a9459ff98f 
								
							 
						 
						
							
							
								
								Admin API: Endpoint for fetching latest user's statuses  
							
							
							
						 
						
							2019-07-14 00:37:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								095117a58c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/ap-hide-follows  
							
							
							
						 
						
							2019-07-12 21:43:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								97b79efbcd 
								
							 
						 
						
							
							
								
								ActivityPub Controller: Actually pass for_user to following/followers  
							
							... 
							
							
							
							views and give 403 errors when trying to request hidden follower pages
when unauthenticated 
							
						 
						
							2019-07-12 20:54:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								360e4cdaa2 
								
							 
						 
						
							
							
								
								Move these to pleroma namespace in Mastodon API  
							
							
							
						 
						
							2019-07-12 11:25:58 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								371d39e160 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-07-09 21:21:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1417627d07 
								
							 
						 
						
							
							
								
								Merge branch 'remove-avatar-header' into 'develop'  
							
							... 
							
							
							
							Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187  
							
						 
						
							2019-07-09 17:51:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9e58d3c624 
								
							 
						 
						
							
							
								
								FallbackRedirector: Do not crash on Metadata rendering errors  
							
							
							
						 
						
							2019-07-08 12:59:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								657277ffc0 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							
							
						 
						
							2019-06-29 00:52:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								74132e3715 
								
							 
						 
						
							
							
								
								Enable IdempotencyPlug for the all API  
							
							
							
						 
						
							2019-06-26 18:42:49 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								a0c4ebb4d7 
								
							 
						 
						
							
							
								
								[ #184 ] small refactoring  reset password  
							
							
							
						 
						
							2019-06-24 19:01:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								a0c65bbd6c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'remove-avatar-header'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2019-06-23 03:25:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9b908697dd 
								
							 
						 
						
							
							
								
								OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f  
							
							... 
							
							
							
							and this leftover artifact breaks compiling now. 
							
						 
						
							2019-06-15 07:04:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								c2ca1f22a2 
								
							 
						 
						
							
							
								
								it is changed in compile time  
							
							... 
							
							
							
							we can't change module attributes and endpoint settings in runtime 
							
						 
						
							2019-06-14 15:45:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								ee4ed87fb4 
								
							 
						 
						
							
							
								
								[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)  
							
							
							
						 
						
							2019-06-14 11:39:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								92213fb87c 
								
							 
						 
						
							
							
								
								Replace Mix.env with Pleroma.Config.get(:env)  
							
							... 
							
							
							
							Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases. 
							
						 
						
							2019-06-06 23:59:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6ef145b4fc 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-06-03 15:29:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								026b245dbc 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/polls-2-electric-boogalo  
							
							
							
						 
						
							2019-06-03 11:14:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								65db5e9f52 
								
							 
						 
						
							
							
								
								Resolve merge conflicts  
							
							
							
						 
						
							2019-06-01 16:29:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								300d94c628 
								
							 
						 
						
							
							
								
								Add poll votes  
							
							... 
							
							
							
							Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects 
							
						 
						
							2019-06-01 16:17:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5d3ece2861 
								
							 
						 
						
							
							
								
								Remove now useless flavours switching  
							
							
							
						 
						
							2019-06-01 01:44:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								6aec0d1b58 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !1209  
							
						 
						
							2019-05-29 22:10:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ce47017c89 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-05-29 18:18:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0159a6dbe9 
								
							 
						 
						
							
							
								
								router: require oauth_read for searching  
							
							... 
							
							
							
							Search calls are generally expensive and allow unauthenticated users to
crawl the instance for user profiles or posts which contain specified
keywords.  An adversary can build a distributed search engine which not
only will consume significant instance resources, but also can be used
for undesirable purposes such as datamining.
Accordingly, require authenticated access to use the search API endpoints.
This acts as a nice balance as it allows guest users to make use of most
functionality available in Pleroma FE while ensuring that Pleroma
instances are reasonably protected from resource exhaustion.  It also
removes Pleroma as a potential vector in distributed search engines. 
							
						 
						
							2019-05-29 10:58:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								1452a96ad6 
								
							 
						 
						
							
							
								
								ability to set and reset avatar, profile banner and backgroud in Mastodon API  
							
							
							
						 
						
							2019-05-27 15:31:01 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								79c2cef2fb 
								
							 
						 
						
							
							
								
								Merge branch 'mongooseim-support' into 'develop'  
							
							... 
							
							
							
							MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172  
							
						 
						
							2019-05-22 04:06:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								3ab9255eda 
								
							 
						 
						
							
							
								
								Respond with a 404 Not implemented JSON error message  
							
							... 
							
							
							
							when requested API is not implemented 
							
						 
						
							2019-05-22 07:15:52 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								63b0b7190c 
								
							 
						 
						
							
							
								
								MastoAPI: Add GET /api/v1/polls/:id  
							
							
							
						 
						
							2019-05-21 20:40:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								54e9cb5c2d 
								
							 
						 
						
							
							
								
								Add API endpoints for a custom user mascot  
							
							
							
						 
						
							2019-05-20 12:39:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f959bf7aa6 
								
							 
						 
						
							
							
								
								MongooseIM: Add basic integration endpoints.  
							
							
							
						 
						
							2019-05-17 18:21:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								e2b3a27204 
								
							 
						 
						
							
							
								
								Add Reports to Admin API  
							
							
							
						 
						
							2019-05-16 19:09:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								70c81b95d0 
								
							 
						 
						
							
							
								
								Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug  
							
							
							
						 
						
							2019-05-15 05:09:32 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5e2b491276 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-05-14 18:15:56 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a2be420f94 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: fullname & bio are optionnal  
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2019-05-13 18:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								f01f995816 
								
							 
						 
						
							
							
								
								make url uniform in admin api  
							
							
							
						 
						
							2019-05-11 14:46:00 +05:45