lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								56956de6fa
								
							
						 | 
						
							
							
								
								Merge branch 'fix/status-reblogged' into 'develop'
							
							
							
							
							
							
							
							Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057 
							
						 | 
						
							2019-04-15 10:26:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								f358295cbe
								
							
						 | 
						
							
							
								
								Merge branch 'unfollow-oneself' into 'develop'
							
							
							
							
							
							
							
							Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061 
							
						 | 
						
							2019-04-15 10:24:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								27d78dc526
								
							
						 | 
						
							
							
								
								Use User.get_cached_by*
							
							
							
							
							
						 | 
						
							2019-04-15 12:37:49 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								5d73dca064
								
							
						 | 
						
							
							
								
								Remove inReplyToStatusId
							
							
							
							
							
						 | 
						
							2019-04-15 11:50:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								507e7821e3
								
							
						 | 
						
							
							
								
								Handle follow/unfollow directed to themselves
							
							
							
							
							
						 | 
						
							2019-04-15 10:21:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								679a8ef629
								
							
						 | 
						
							
							
								
								Assign reblogged in the Mastodon reblog status view
							
							
							
							
							
						 | 
						
							2019-04-14 11:35:15 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a09692c7d
								
							
						 | 
						
							
							
								
								Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
							
							
							
							
							
							
							
							Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976 
							
						 | 
						
							2019-04-12 09:34:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								711ade961e
								
							
						 | 
						
							
							
								
								adding destroy multiple for mastofe
							
							
							
							
							
						 | 
						
							2019-04-12 02:28:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e03d24af96
								
							
						 | 
						
							
							
								
								in_reply_to_id - null
							
							
							
							
							
						 | 
						
							2019-04-12 02:21:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								be8350baa2
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/user-status-subscriptions
							
							
							
							
							
						 | 
						
							2019-04-10 10:44:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								23067908de
								
							
						 | 
						
							
							
								
								Merge branch 'feature/770-add-emoji-tags' into 'develop'
							
							
							
							
							
							
							
							Feature/770 add emoji tags
See merge request pleroma/pleroma!998 
							
						 | 
						
							2019-04-08 09:50:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								2056efa714
								
							
						 | 
						
							
							
								
								Add scheduler for sending scheduled activities to the queue
							
							
							
							
							
						 | 
						
							2019-04-06 23:56:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								fc92a0fd8d
								
							
						 | 
						
							
							
								
								Added limits and media attachments for scheduled activities.
							
							
							
							
							
						 | 
						
							2019-04-06 23:55:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								b3870df51f
								
							
						 | 
						
							
							
								
								Handle scheduled_at on status creation.
							
							
							
							
							
						 | 
						
							2019-04-06 23:55:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								7bf622ce73
								
							
						 | 
						
							
							
								
								Add scheduled activities
							
							
							
							
							
						 | 
						
							2019-04-06 23:55:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								7410aee886
								
							
						 | 
						
							
							
								
								Merge develop to 770-add-emoji-tags
							
							
							
							
							
							
							
							Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs 
							
						 | 
						
							2019-04-06 20:34:00 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								325a268017
								
							
						 | 
						
							
							
								
								Redirect to the referer url after mastofe authorization
							
							
							
							
							
						 | 
						
							2019-04-05 23:36:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ca91cbb87
								
							
						 | 
						
							
							
								
								Change relationship direction of subscriptions
							
							
							
							
							
						 | 
						
							2019-04-05 17:02:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								a79ce94dd4
								
							
						 | 
						
							
							
								
								Merge branch 'feature/fake-statuses' into 'develop'
							
							
							
							
							
							
							
							Add fake status submit
See merge request pleroma/pleroma!995 
							
						 | 
						
							2019-04-02 14:17:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e0567ec52
								
							
						 | 
						
							
							
								
								Merge develop into feature/770-add-emoji-tags
							
							
							
							
							
						 | 
						
							2019-04-02 19:16:29 +07: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								26d509cc86
								
							
						 | 
						
							
							
								
								Merge branch 'get_by_id' into 'develop'
							
							
							
							
							
							
							
							Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009 
							
						 | 
						
							2019-04-02 10:52:29 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cascode
								
							 
						 | 
						
							
							
							
							
								
							
							
								95c92c49c9
								
							
						 | 
						
							
							
								
								Fix account lookup for nicknames beginning with numbers
							
							
							
							
							
						 | 
						
							2019-04-02 10:51:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								11c2d6bdc4
								
							
						 | 
						
							
							
								
								change Repo.get(Activity, id) => Activity.get_by_id(id) in tests
							
							
							
							
							
						 | 
						
							2019-04-02 17:08:03 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b3d921921
								
							
						 | 
						
							
							
								
								change Repo.get(User, id) => User.get_by_id(id)
							
							
							
							
							
						 | 
						
							2019-04-02 17:01:26 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								3601f03147
								
							
						 | 
						
							
							
								
								Adding tag to emoji ets table
							
							
							
							
							
							
							
							changes in apis 
							
						 | 
						
							2019-04-01 17:17:57 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								1bb4d5d65b
								
							
						 | 
						
							
							
								
								Implement fake status submit
							
							
							
							
							
						 | 
						
							2019-03-29 21:59:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6b407872b4
								
							
						 | 
						
							
							
								
								mastodon_api_controller.ex: Use min_id in link header instead of since_id
							
							
							
							
							
						 | 
						
							2019-03-28 17:23:21 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								a4ab60ac54
								
							
						 | 
						
							
							
								
								Add vapid_key to the POST /api/v1/apps response
							
							
							
							
							
						 | 
						
							2019-03-26 23:27:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								691d1208b5
								
							
						 | 
						
							
							
								
								Add GET /api/v1/apps/verify_credentials
							
							
							
							
							
						 | 
						
							2019-03-26 21:53:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								47b49ab1a1
								
							
						 | 
						
							
							
								
								Test for MastoAPI /api/v1/instance response structure (formatting fix).
							
							
							
							
							
						 | 
						
							2019-03-26 18:18:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								caf0e9cf33
								
							
						 | 
						
							
							
								
								Test for MastoAPI /api/v1/instance response structure.
							
							
							
							
							
						 | 
						
							2019-03-26 18:13:24 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fong-Wan Chau
								
							 
						 | 
						
							
							
							
							
								
							
							
								4ed2618f6c
								
							
						 | 
						
							
							
								
								Allow 'rel' attribute on <a> link with specific values (for hashtag recognition).
							
							
							
							
							
						 | 
						
							2019-03-17 11:03:19 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								23960309a0
								
							
						 | 
						
							
							
								
								[Credo] Change quoted string with 3+ quotes to sigils
							
							
							
							
							
						 | 
						
							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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								2827dfea50
								
							
						 | 
						
							
							
								
								Allow an admin to delete a user status
							
							
							
							
							
						 | 
						
							2019-03-08 20:21:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								7342b5a45f
								
							
						 | 
						
							
							
								
								Preserve parameters in link headers (Mastodon API)
							
							
							
							
							
						 | 
						
							2019-03-07 09:12:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								86e4b48a5e
								
							
						 | 
						
							
							
								
								Fix DM visibility for blocking users
							
							
							
							
							
						 | 
						
							2019-03-04 06:24:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								d5418e9ff7
								
							
						 | 
						
							
							
								
								Remove follow_request_count as it's not needed for FE anymore.
							
							
							
							
							
							
							
							MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load. 
							
						 | 
						
							2019-03-03 18:42:27 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6fe7acd58e
								
							
						 | 
						
							
							
								
								[#468] Merged upstream/develop.
							
							
							
							
							
						 | 
						
							2019-02-20 16:48:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								04ee877a20
								
							
						 | 
						
							
							
								
								[#468] Added OAuth scopes-specific tests.
							
							
							
							
							
						 | 
						
							2019-02-19 22:28:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad2cf4fd86
								
							
						 | 
						
							
							
								
								Add test for mastodon muting endpoints
							
							
							
							
							
						 | 
						
							2019-02-19 21:49:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								c23bd05737
								
							
						 | 
						
							
							
								
								Merge branch 'features/flavour-switching' into 'develop'
							
							
							
							
							
							
							
							[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807 
							
						 | 
						
							2019-02-18 04:01:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								72a4272d84
								
							
						 | 
						
							
							
								
								Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
							
							
							
							
							
						 | 
						
							2019-02-16 19:52:46 +01:00 | 
						
						
							
							
							
								
							
							
						 |