William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								3cc2554fa3
								
							
						 | 
						
							
							
								
								mastodon api: add conversation_id extension (ref #674)
							
							
							
							
							
						 | 
						
							2019-03-21 23:25:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								1588688a11
								
							
						 | 
						
							
							
								
								Added support for exclude_types, limit, and min_id in Mastodon
							
							
							
							
							
							
							
							notifications.
Unify Mastodon-compatible pagination logic. 
							
						 | 
						
							2019-03-18 11:27:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								da53c079db
								
							
						 | 
						
							
							
								
								Refactor to store user ap_id, add tests
							
							
							
							
							
						 | 
						
							2019-03-15 14:20:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								15b21d1983
								
							
						 | 
						
							
							
								
								refactor filtering mechanism
							
							
							
							
							
						 | 
						
							2019-03-15 14:18:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								c8f31e0bc2
								
							
						 | 
						
							
							
								
								Implement mastodon's reblog hiding feature
							
							
							
							
							
						 | 
						
							2019-03-15 14:18:21 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								41fc67aa49
								
							
						 | 
						
							
							
								
								Merge branch 'mastoapi/mime_type' into 'develop'
							
							
							
							
							
							
							
							Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938 
							
						 | 
						
							2019-03-15 09:48:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								d7a34b604b
								
							
						 | 
						
							
							
								
								Extend MastoAPI to provide attachment mimetypes
							
							
							
							
							
						 | 
						
							2019-03-15 11:58:12 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								100413bf2c
								
							
						 | 
						
							
							
								
								Add is_seen to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
							
							
							
							
							
						 | 
						
							2019-03-15 01:35:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								59333f2d56
								
							
						 | 
						
							
							
								
								Merge branch 'admin-api-account-view-namespace' into 'develop'
							
							
							
							
							
							
							
							MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930 
							
						 | 
						
							2019-03-14 02:01:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								86871c8a04
								
							
						 | 
						
							
							
								
								Merge branch 'feature/add-local-to-users-admin-api' into 'develop'
							
							
							
							
							
							
							
							Add "local" & "tags" to users admin API
See merge request pleroma/pleroma!932 
							
						 | 
						
							2019-03-14 02:00:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f3964f4024
								
							
						 | 
						
							
							
								
								Ensure empty array is returned for tags
							
							
							
							
							
						 | 
						
							2019-03-14 03:17:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								257d8e78e5
								
							
						 | 
						
							
							
								
								Add tags
							
							
							
							
							
						 | 
						
							2019-03-14 01:52:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e72762322
								
							
						 | 
						
							
							
								
								Merge branch 'mastofe-content-types' into 'develop'
							
							
							
							
							
							
							
							Set content types settings on mastofe endpoint.
See merge request pleroma/pleroma!894 
							
						 | 
						
							2019-03-13 22:04:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								e416c344dd
								
							
						 | 
						
							
							
								
								Unify unfollow, accept and reject follow requests using CommonAPI
							
							
							
							
							
						 | 
						
							2019-03-13 20:28:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								490d9cf7b1
								
							
						 | 
						
							
							
								
								Add "local" to users admin API
							
							
							
							
							
						 | 
						
							2019-03-13 16:04:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cc0f2f8ba3
								
							
						 | 
						
							
							
								
								MastodonAPI.Admin.AccountView → AdminAPI.AccountView
							
							
							
							
							
						 | 
						
							2019-03-13 12:17:57 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								fb82f6fc7c
								
							
						 | 
						
							
							
								
								[Credo] Remove parentesis on argument-less functions
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483
								
							
						 | 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								25eb6cf1cb
								
							
						 | 
						
							
							
								
								Add "roles" to users admin API
							
							
							
							
							
						 | 
						
							2019-03-12 22:15:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								c231ed610a
								
							
						 | 
						
							
							
								
								Merge branch 'masto-api-followers-following' into 'develop'
							
							
							
							
							
							
							
							MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924 
							
						 | 
						
							2019-03-12 16:27:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								984b5f8adf
								
							
						 | 
						
							
							
								
								MastoAPI followers/following endpoints
							
							
							
							
							
						 | 
						
							2019-03-12 16:01:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3474066f6d
								
							
						 | 
						
							
							
								
								MastoAPI Accounts: Add fetching by nickname.
							
							
							
							
							
							
							
							This is to make it easier for the frontends to handle domain.com/users/nickname
urls. 
							
						 | 
						
							2019-03-11 15:18:32 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4811eefa6e
								
							
						 | 
						
							
							
								
								MastoAPI StatusView: Add locality indicator.
							
							
							
							
							
						 | 
						
							2019-03-11 13:48:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								19afd9f81f
								
							
						 | 
						
							
							
								
								http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
							
							
							
							
							
						 | 
						
							2019-03-08 22:56:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								7342b5a45f
								
							
						 | 
						
							
							
								
								Preserve parameters in link headers (Mastodon API)
							
							
							
							
							
						 | 
						
							2019-03-07 09:12:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc7570c282
								
							
						 | 
						
							
							
								
								[#647] tests for web push
							
							
							
							
							
						 | 
						
							2019-03-06 13:20:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								10248d86a2
								
							
						 | 
						
							
							
								
								Merge branch 'unify-follow' into 'develop'
							
							
							
							
							
							
							
							Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889 
							
						 | 
						
							2019-03-04 13:25:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									KokaKiwi
								
							 
						 | 
						
							
							
							
							
								
							
							
								bf43f055dd
								
							
						 | 
						
							
							
								
								Set content types settings on mastofe endpoint.
							
							
							
							
							
						 | 
						
							2019-03-04 12:00:02 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								86e4b48a5e
								
							
						 | 
						
							
							
								
								Fix DM visibility for blocking users
							
							
							
							
							
						 | 
						
							2019-03-04 06:24:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								594694607c
								
							
						 | 
						
							
							
								
								Unify Mastodon and Twitter follow implementations using CommonAPI
							
							
							
							
							
						 | 
						
							2019-03-04 01:00:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								6c6a2dbfdd
								
							
						 | 
						
							
							
								
								Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
							
							
							
							
							
							
							
							Add pagination and search to users
See merge request pleroma/pleroma!873 
							
						 | 
						
							2019-03-03 15:59:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b08b470f6
								
							
						 | 
						
							
							
								
								Add "local" params to users search
							
							
							
							
							
						 | 
						
							2019-03-01 20:13:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								28b4093233
								
							
						 | 
						
							
							
								
								mastodon websocket: return errors using ok, not stop
							
							
							
							
							
						 | 
						
							2019-02-28 16:23:55 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								388a3f4ca2
								
							
						 | 
						
							
							
								
								mastodon websocket: bring back infinity timeout
							
							
							
							
							
						 | 
						
							2019-02-28 16:23:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1d37a5e23
								
							
						 | 
						
							
							
								
								mastodon websocket: use pattern match to get query data, robustly handle errors
							
							
							
							
							
						 | 
						
							2019-02-28 16:02:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc53dff5b6
								
							
						 | 
						
							
							
								
								mastodon api: websocket: update code for cowboy 2.x
							
							
							
							
							
						 | 
						
							2019-02-28 15:44:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								72b7a0797e
								
							
						 | 
						
							
							
								
								Use Mastodon API views in Admin API
							
							
							
							
							
						 | 
						
							2019-02-28 17:43:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								cf426a719d
								
							
						 | 
						
							
							
								
								Merge branch 'with-mutes' into 'develop'
							
							
							
							
							
							
							
							Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872 
							
						 | 
						
							2019-02-28 10:22:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c1ae495878
								
							
						 | 
						
							
							
								
								Add user muted status info to MastodonAPI.
							
							
							
							
							
						 | 
						
							2019-02-27 16:46:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								1536640962
								
							
						 | 
						
							
							
								
								mastodon api: embed relationship card under account card for Pleroma FE convenience
							
							
							
							
							
						 | 
						
							2019-02-27 13:01:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e0686efa6
								
							
						 | 
						
							
							
								
								Move visibility into own module.
							
							
							
							
							
						 | 
						
							2019-02-22 13:29:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								62296f5a25
								
							
						 | 
						
							
							
								
								Fix private post card handling.
							
							
							
							
							
						 | 
						
							2019-02-22 12:02:51 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor
								
							 
						 | 
						
							
							
							
							
								
							
							
								bff9eb5ef7
								
							
						 | 
						
							
							
								
								Reports
							
							
							
							
							
						 | 
						
							2019-02-20 16:51:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								59c27f29c8
								
							
						 | 
						
							
							
								
								Add some nicer urls in status view.
							
							
							
							
							
						 | 
						
							2019-02-20 17:36:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b574d97c2e
								
							
						 | 
						
							
							
								
								[#468] Added support for push OAuth scope (Mastodon 2.4+).
							
							
							
							
							
						 | 
						
							2019-02-20 17:27:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6fe7acd58e
								
							
						 | 
						
							
							
								
								[#468] Merged upstream/develop.
							
							
							
							
							
						 | 
						
							2019-02-20 16:48:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								5a46d37af9
								
							
						 | 
						
							
							
								
								Update the mute implementation to the current codebase
							
							
							
							
							
							
							
							Make it part of the info thing (and do a migration to ensure it's there) 
							
						 | 
						
							2019-02-19 23:09:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								da64ea4a55
								
							
						 | 
						
							
							
								
								Implement mastodon mutes endpoint
							
							
							
							
							
							
							
							Aparently i forgot to add it, it gets a list of muted users 
							
						 | 
						
							2019-02-19 21:49:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								f41f017bbc
								
							
						 | 
						
							
							
								
								Implement muting, add it to the mastodon API
							
							
							
							
							
						 | 
						
							2019-02-19 21:49:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c0ecbf6669
								
							
						 | 
						
							
							
								
								[#468] Merged upstream/develop.
							
							
							
							
							
						 | 
						
							2019-02-19 19:10:55 +03:00 | 
						
						
							
							
							
								
							
							
						 |