Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4bf2bb9cff 
								
							 
						 
						
							
							
								
								Fix password reset for non-test env  
							
							 
							
							... 
							
							
							
							Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled. 
							
						 
						
							2019-07-17 18:09:31 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								996fd58ac4 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/poll-id-as-string' into 'develop'  
							
							 
							
							... 
							
							
							
							Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430  
							
						 
						
							2019-07-16 06:06:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7a24def473 
								
							 
						 
						
							
							
								
								Mastodon Controller: Fix tests.  
							
							 
							
							
							
						 
						
							2019-07-16 14:01:18 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								b74300bc7a 
								
							 
						 
						
							
							
								
								Add more tests for MastodonAPIController and CommonAPI  
							
							 
							
							
							
						 
						
							2019-07-15 19:47:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c39b7ac8 
								
							 
						 
						
							
							
								
								Feature/1072 muting notifications  
							
							 
							
							
							
						 
						
							2019-07-14 13:29:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								360e4cdaa2 
								
							 
						 
						
							
							
								
								Move these to pleroma namespace in Mastodon API  
							
							 
							
							
							
						 
						
							2019-07-12 11:25:58 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								252e129b1e 
								
							 
						 
						
							
							
								
								MastoAPI: Add categories to custom emojis  
							
							 
							
							... 
							
							
							
							Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch. 
							
						 
						
							2019-07-10 17:02:37 +02: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								1f76740e10 
								
							 
						 
						
							
							
								
								Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)  
							
							 
							
							
							
						 
						
							2019-06-30 09:08:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								d53fb55bb7 
								
							 
						 
						
							
							
								
								Return correct response when reply to a direct message is not direct itself  
							
							 
							
							
							
						 
						
							2019-06-26 10:59:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4ad15ad2a9 
								
							 
						 
						
							
							
								
								add ignore hosts and TLDs for rich_media  
							
							 
							
							
							
						 
						
							2019-06-25 22:25:37 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								a0c65bbd6c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'remove-avatar-header'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2019-06-23 03:25:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a440cf856d 
								
							 
						 
						
							
							
								
								Mastodon API: Return the token needed for the chat.  
							
							 
							
							
							
						 
						
							2019-06-15 10:59:35 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								62ffc00a5d 
								
							 
						 
						
							
							
								
								Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'  
							
							 
							
							... 
							
							
							
							AccountView: Add user background.
See merge request pleroma/pleroma!1280  
							
						 
						
							2019-06-14 16:49:28 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								ee4ed87fb4 
								
							 
						 
						
							
							
								
								[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)  
							
							 
							
							
							
						 
						
							2019-06-14 11:39:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								eac298083f 
								
							 
						 
						
							
							
								
								MastodonAPI: Add a way to update the background image.  
							
							 
							
							
							
						 
						
							2019-06-14 11:19:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								63ab3c30eb 
								
							 
						 
						
							
							
								
								Merge branch 'feature/rate-limiter' into 'develop'  
							
							 
							
							... 
							
							
							
							Feature/Rate Limiter
Closes  #943 
See merge request pleroma/pleroma!1266  
							
						 
						
							2019-06-11 11:32:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								ad04d12de6 
								
							 
						 
						
							
							
								
								Replace MastodonAPIController.account_register/2 rate limiter  
							
							 
							
							
							
						 
						
							2019-06-11 16:06:03 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								365268d522 
								
							 
						 
						
							
							
								
								Add more tests for using media_proxy and whitelists  
							
							 
							
							
							
						 
						
							2019-06-10 11:34:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7e9f7ea0c2 
								
							 
						 
						
							
							
								
								MastodonAPI: Add test for user search.  
							
							 
							
							
							
						 
						
							2019-06-06 16:16:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5b04f07a1e 
								
							 
						 
						
							
							
								
								Limit search for unauthenticated users to local users only  
							
							 
							
							
							
						 
						
							2019-06-05 16:51:04 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4f2e359687 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/941  
							
							 
							
							
							
						 
						
							2019-06-04 09:49:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9d2563a3de 
								
							 
						 
						
							
							
								
								Merge branch 'generic-fe-settings' into 'develop'  
							
							 
							
							... 
							
							
							
							Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221  
							
						 
						
							2019-06-04 05:43:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f13d6c7f78 
								
							 
						 
						
							
							
								
								update api to set skip_thread_containment  
							
							 
							
							
							
						 
						
							2019-06-03 21:02:57 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dc91bcc0af 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/polls-2-electric-boogalo  
							
							 
							
							
							
						 
						
							2019-06-03 13:16:17 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								314758c25b 
								
							 
						 
						
							
							
								
								Merge branch 'align-mastodon-conversations' into 'develop'  
							
							 
							
							... 
							
							
							
							Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215  
							
						 
						
							2019-06-03 09:48:37 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								026b245dbc 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/polls-2-electric-boogalo  
							
							 
							
							
							
						 
						
							2019-06-03 11:14:52 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2fe3a20638 
								
							 
						 
						
							
							
								
								Make error message about author's inability to vote more sensible  
							
							 
							
							
							
						 
						
							2019-06-02 23:33:15 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cfa588e357 
								
							 
						 
						
							
							
								
								Fix Credo issues  
							
							 
							
							
							
						 
						
							2019-06-01 21:42:29 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7861974ab2 
								
							 
						 
						
							
							
								
								MastodonAPI: Add extension to set and get pleroma_settings_store.  
							
							 
							
							
							
						 
						
							2019-05-31 14:50:18 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								97fb50d9fa 
								
							 
						 
						
							
							
								
								Mastodon Conversation API: Don't return own account in 'accounts'.  
							
							 
							
							
							
						 
						
							2019-05-31 11:27:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								1690be991e 
								
							 
						 
						
							
							
								
								Replace missing non-nullable Card attributes with empty strings  
							
							 
							
							
							
						 
						
							2019-05-30 21:03:31 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								63b0b7190c 
								
							 
						 
						
							
							
								
								MastoAPI: Add GET /api/v1/polls/:id  
							
							 
							
							
							
						 
						
							2019-05-21 20:40:35 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0407ffe75f 
								
							 
						 
						
							
							
								
								Change validation error status codes to be more appropriate  
							
							 
							
							
							
						 
						
							2019-05-21 17:12:38 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3f96b3e4b8 
								
							 
						 
						
							
							
								
								Enforce poll limits and add error handling for MastodonAPI's post endpoint  
							
							 
							
							
							
						 
						
							2019-05-21 10:54:20 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								76a7429bef 
								
							 
						 
						
							
							
								
								Add poll limits to /api/v1/instance and initial state  
							
							 
							
							
							
						 
						
							2019-05-21 09:13:10 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dc916ba15f 
								
							 
						 
						
							
							
								
								Format mascot tests  
							
							 
							
							
							
						 
						
							2019-05-20 12:58:17 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e81f0fc6d4 
								
							 
						 
						
							
							
								
								Add mascot get/set tests  
							
							 
							
							
							
						 
						
							2019-05-20 12:58:06 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5ece901af3 
								
							 
						 
						
							
							
								
								Resolve merge conflicts and remove IO.inspects  
							
							 
							
							
							
						 
						
							2019-05-18 13:37:38 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fd920c8973 
								
							 
						 
						
							
							
								
								Mastodon API: Add support for posting polls  
							
							 
							
							
							
						 
						
							2019-05-18 13:29:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								7ed682213f 
								
							 
						 
						
							
							
								
								Fix/902 random compile failing  
							
							 
							
							
							
						 
						
							2019-05-17 07:25:20 +00: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a2be420f94 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: fullname & bio are optionnal  
							
							 
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2019-05-13 18:35:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								7701a4c841 
								
							 
						 
						
							
							
								
								Make irreversible field default to false in filters  
							
							 
							
							
							
						 
						
							2019-05-14 00:13:15 +05:45