lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6745bc951c 
								
							 
						 
						
							
							
								
								Documentation: Document chat token response.  
							
							 
							
							
							
						 
						
							2019-06-15 11:11:45 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								774637a2f4 
								
							 
						 
						
							
							
								
								Mastodon API: Document changes.  
							
							 
							
							
							
						 
						
							2019-06-14 11:24:09 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e4babb1c9f 
								
							 
						 
						
							
							
								
								Merge branch 'explicit-addressing' into 'develop'  
							
							 
							
							... 
							
							
							
							Explicit addressing
See merge request pleroma/pleroma!1239  
							
						 
						
							2019-06-05 08:28:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								96121315f3 
								
							 
						 
						
							
							
								
								fix merge  
							
							 
							
							
							
						 
						
							2019-06-04 12:41:24 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4cab98b7bf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into explicit-addressing  
							
							 
							
							
							
						 
						
							2019-06-04 11:23:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								25198d48f7 
								
							 
						 
						
							
							
								
								Docs: Add Explicit addressing to Readme and changelog.  
							
							 
							
							
							
						 
						
							2019-06-04 10:49:57 +02: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5d3ece2861 
								
							 
						 
						
							
							
								
								Remove now useless flavours switching  
							
							 
							
							
							
						 
						
							2019-06-01 01:44:10 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								10fe02acef 
								
							 
						 
						
							
							
								
								Documentation: Document Settings store mechanism.  
							
							 
							
							
							
						 
						
							2019-05-31 14:59:24 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								54e9cb5c2d 
								
							 
						 
						
							
							
								
								Add API endpoints for a custom user mascot  
							
							 
							
							
							
						 
						
							2019-05-20 12:39:23 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								e2b3a27204 
								
							 
						 
						
							
							
								
								Add Reports to Admin API  
							
							 
							
							
							
						 
						
							2019-05-16 19:09:18 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Angelina Filippova 
								
							 
						 
						
							
							
							
							
								
							
							
								107c83ab2b 
								
							 
						 
						
							
							
								
								Note that nicknames is an array  
							
							 
							
							
							
						 
						
							2019-05-16 01:48:53 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Angelina Filippova 
								
							 
						 
						
							
							
							
							
								
							
							
								0641e685c1 
								
							 
						 
						
							
							
								
								Note that nicknames is an array  
							
							 
							
							
							
						 
						
							2019-05-16 01:46:43 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Angelina Filippova 
								
							 
						 
						
							
							
							
							
								
							
							
								1d2923e5d0 
								
							 
						 
						
							
							
								
								Update tag/untag docs  
							
							 
							
							
							
						 
						
							2019-05-16 01:36:26 +03: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								bfeb33e951 
								
							 
						 
						
							
							
								
								Merge develop  
							
							 
							
							... 
							
							
							
							Merge conflict in lib/pleroma/activity.ex 
							
						 
						
							2019-05-08 14:34:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1557b99beb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							 
							
							
							
						 
						
							2019-05-07 16:51:11 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								1040caf096 
								
							 
						 
						
							
							
								
								fix format  
							
							 
							
							... 
							
							
							
							Modified-by: Maksim Pechnikov <parallel588@gmail.com> 
							
						 
						
							2019-05-06 17:51:03 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ce3789e39a 
								
							 
						 
						
							
							
								
								Add default_scope to /api/v1/update_credentials  
							
							 
							
							
							
						 
						
							2019-04-27 23:55:54 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc8425659 
								
							 
						 
						
							
							
								
								Move settings to Source subentity  
							
							 
							
							
							
						 
						
							2019-04-25 10:31:14 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								c157e27a00 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/disable-account  
							
							 
							
							
							
						 
						
							2019-04-25 13:41:10 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4baea6e6d9 
								
							 
						 
						
							
							
								
								Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API  
							
							 
							
							... 
							
							
							
							This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs 
							
						 
						
							2019-04-24 20:01:42 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								9dd36e5bcb 
								
							 
						 
						
							
							
								
								Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )  
							
							 
							
							
							
						 
						
							2019-04-23 02:47:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f60d072bbb 
								
							 
						 
						
							
							
								
								Add pleroma.in_reply_to_account_acct to MastoAPI status entity  
							
							 
							
							
							
						 
						
							2019-04-22 11:54:27 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								88f0be9693 
								
							 
						 
						
							
							
								
								Feature/826 healthcheck endpoint  
							
							 
							
							
							
						 
						
							2019-04-22 07:19:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e8c2f9a73a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							 
							
							
							
						 
						
							2019-04-22 13:08:30 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d086319733 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: content_type parameter of post submission  
							
							 
							
							
							
						 
						
							2019-04-21 12:48:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								1aa4994f6d 
								
							 
						 
						
							
							
								
								Do not require authentication for user search in MastoAPI  
							
							 
							
							
							
						 
						
							2019-04-18 12:44:25 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								38926a063a 
								
							 
						 
						
							
							
								
								add /api/pleroma/disable_account to docs/api/pleroma_api.md  
							
							 
							
							
							
						 
						
							2019-04-15 16:39:42 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								e5d553aa45 
								
							 
						 
						
							
							
								
								Merge branch 'feature/767-multiple-use-invite-token' into 'develop'  
							
							 
							
							... 
							
							
							
							Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032  
							
						 
						
							2019-04-10 10:10:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								be8350baa2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/user-status-subscriptions  
							
							 
							
							
							
						 
						
							2019-04-10 10:44:54 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								c8440b5e0c 
								
							 
						 
						
							
							
								
								Merge branch 'fix/emoji-api-nonsense' into 'develop'  
							
							 
							
							... 
							
							
							
							Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038  
							
						 
						
							2019-04-10 06:22:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								97395e013e 
								
							 
						 
						
							
							
								
								Merge branch 'notification-pleroma-settings' into 'develop'  
							
							 
							
							... 
							
							
							
							Notification controls
Closes  #738 
See merge request pleroma/pleroma!988  
							
						 
						
							2019-04-10 02:10:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b57b43027c 
								
							 
						 
						
							
							
								
								Change response format of /api/pleroma/emoji to the one that actually makes sense  
							
							 
							
							
							
						 
						
							2019-04-09 23:20:31 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								012bb5dcc9 
								
							 
						 
						
							
							
								
								renaming expire_at -> expires_at  
							
							 
							
							... 
							
							
							
							keyword style change 
							
						 
						
							2019-04-08 16:01:28 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								b810aac117 
								
							 
						 
						
							
							
								
								added docs to docs/api/admin_api.md  
							
							 
							
							... 
							
							
							
							code style and little renamings 
							
						 
						
							2019-04-07 19:48:52 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e6778003ab 
								
							 
						 
						
							
							
								
								JSON need quotes!  
							
							 
							
							
							
						 
						
							2019-04-06 16:24:21 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c05fe4da0a 
								
							 
						 
						
							
							
								
								Document subscription endpoints, fix typos  
							
							 
							
							... 
							
							
							
							Also adds a quick error case on the subscription endpoints
to avoid 500s 
							
						 
						
							2019-04-06 16:20:06 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								da64a5aece 
								
							 
						 
						
							
							
								
								Document the admin API endpoints for controlling follow/unfollow  
							
							 
							
							
							
						 
						
							2019-04-05 11:29:34 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								79cb34a4b0 
								
							 
						 
						
							
							
								
								Fix preview not being usable in form data  
							
							 
							
							
							
						 
						
							2019-04-02 23:07:16 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fdb4357e9b 
								
							 
						 
						
							
							
								
								Rename fake param to preview and make the tests check that the object was not inserted to the db  
							
							 
							
							
							
						 
						
							2019-04-02 14:31:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								42b779527c 
								
							 
						 
						
							
							
								
								document fake option  
							
							 
							
							
							
						 
						
							2019-03-29 22:15:20 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								749d53e2b2 
								
							 
						 
						
							
							
								
								Merge branch 'sayonara-gitlab-wiki' into 'develop'  
							
							 
							
							... 
							
							
							
							Move out of Gitlab Wiki
See merge request pleroma/pleroma!990  
							
						 
						
							2019-03-29 10:24:52 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9bd80e6044 
								
							 
						 
						
							
							
								
								did it really take me 4 commits to fix this?  
							
							 
							
							
							
						 
						
							2019-03-28 20:27:01 +03:00