Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4908e0eeee
								
							
						 | 
						
							
							
								
								Fix Credo warning
							
							
							
							
							
						 | 
						
							2019-04-21 23:24:33 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								eeb093631c
								
							
						 | 
						
							
							
								
								Fix Credo warning
							
							
							
							
							
						 | 
						
							2019-04-21 23:19:36 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e56afefef9
								
							
						 | 
						
							
							
								
								Refactor conversation function in MastodonAPIController to use a View
							
							
							
							
							
						 | 
						
							2019-04-21 23:14:27 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2662bea4e0
								
							
						 | 
						
							
							
								
								Add accounts and last_status to conversation read response
							
							
							
							
							
						 | 
						
							2019-04-21 20:26:13 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								76999c73a7
								
							
						 | 
						
							
							
								
								Conversation: Add accounts to output.
							
							
							
							
							
						 | 
						
							2019-04-15 22:28:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0da985182f
								
							
						 | 
						
							
							
								
								Conversation: Return full status object, id is a string.
							
							
							
							
							
						 | 
						
							2019-04-15 21:58:58 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c352a0aba6
								
							
						 | 
						
							
							
								
								Conversations: Make tests run.
							
							
							
							
							
						 | 
						
							2019-04-10 17:48:31 +02: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								f0f30019e1
								
							
						 | 
						
							
							
								
								Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
							
							
							
							
							
						 | 
						
							2019-04-05 15:19:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								af0065a71f
								
							
						 | 
						
							
							
								
								mastodon_api_controller.ex: Add pleroma-tan to initial_state
							
							
							
							
							
						 | 
						
							2019-04-04 09:07:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa8483cb80
								
							
						 | 
						
							
							
								
								Merging develop into feature/770-add-emoji-tags
							
							
							
							
							
							
							
							Conflict test/web/twitter_api/util_controller_test.exs 
							
						 | 
						
							2019-04-02 20:39:52 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								b95cf3d490
								
							
						 | 
						
							
							
								
								Merge branch 'get_by_id' into 'develop'
							
							
							
							
							
							
							
							Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010 
							
						 | 
						
							2019-04-02 12:43:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e0567ec52
								
							
						 | 
						
							
							
								
								Merge develop into feature/770-add-emoji-tags
							
							
							
							
							
						 | 
						
							2019-04-02 19:16:29 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								091baf9316
								
							
						 | 
						
							
							
								
								Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
							
							
							
							
							
							
							
							MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999 
							
						 | 
						
							2019-04-02 10:57:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								88d3cb44c3
								
							
						 | 
						
							
							
								
								replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname)
							
							
							
							
							
						 | 
						
							2019-04-02 17:47:02 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b3d921921
								
							
						 | 
						
							
							
								
								change Repo.get(User, id) => User.get_by_id(id)
							
							
							
							
							
						 | 
						
							2019-04-02 17:01:26 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								4212527928
								
							
						 | 
						
							
							
								
								change Repo.get(Activity, id) => Activity.get_by_id(id)
							
							
							
							
							
						 | 
						
							2019-04-02 16:50:31 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6910fb371b
								
							
						 | 
						
							
							
								
								Fixed local MastoFE authentication / force_login option.
							
							
							
							
							
						 | 
						
							2019-04-01 17:25:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								3601f03147
								
							
						 | 
						
							
							
								
								Adding tag to emoji ets table
							
							
							
							
							
							
							
							changes in apis 
							
						 | 
						
							2019-04-01 17:17:57 +07: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								c6ab5ebe7c
								
							
						 | 
						
							
							
								
								Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
							
							
							
							
							
							
							
							Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979 
							
						 | 
						
							2019-03-26 16:01:52 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								eef1042b16
								
							
						 | 
						
							
							
								
								Mastodon 2.7.2 instance attributes (registrations, languages).
							
							
							
							
							
						 | 
						
							2019-03-26 16:27:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								568e348588
								
							
						 | 
						
							
							
								
								Increment replies_count on replies (MastoAPI)
							
							
							
							
							
						 | 
						
							2019-03-26 15:27:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7f58b3c13
								
							
						 | 
						
							
							
								
								Serve non-public activities in /api/v1/favourites
							
							
							
							
							
							
							
							Fixes #648 
							
						 | 
						
							2019-03-25 02:15:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 |