rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								d21d921def
								
							
						 | 
						
							
							
								
								Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
							
							
							
							
							
						 | 
						
							2019-04-22 11:27:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor
								
							 
						 | 
						
							
							
							
							
								
							
							
								b9cdf6d3b9
								
							
						 | 
						
							
							
								
								Use User.get_cached* everywhere
							
							
							
							
							
						 | 
						
							2019-04-22 07:20:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								7fcbda702e
								
							
						 | 
						
							
							
								
								Merge branch 'rework-emoji-management' into 'develop'
							
							
							
							
							
							
							
							Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073 
							
						 | 
						
							2019-04-22 02:07:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								375fd21055
								
							
						 | 
						
							
							
								
								Set correct values in the MastoAPI reblog status view
							
							
							
							
							
						 | 
						
							2019-04-21 05:40:22 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								52ed287e87
								
							
						 | 
						
							
							
								
								Fix incorrect multiple emoji tag handling introduced in initial impl
							
							
							
							
							
						 | 
						
							2019-04-20 11:17:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa48532387
								
							
						 | 
						
							
							
								
								Handle reblogs on the first follow request in MastoAPI
							
							
							
							
							
						 | 
						
							2019-04-20 04:39:49 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								6069d0fd36
								
							
						 | 
						
							
							
								
								Fix object search depending on embeded object
							
							
							
							
							
						 | 
						
							2019-04-18 09:28:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad681877df
								
							
						 | 
						
							
							
								
								Make credo happy
							
							
							
							
							
						 | 
						
							2019-04-17 14:52:01 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								e641651e2b
								
							
						 | 
						
							
							
								
								Fix unbookmarking
							
							
							
							
							
						 | 
						
							2019-04-17 14:27:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								b09ae02c04
								
							
						 | 
						
							
							
								
								Added some more normalization calls all in mastodon api controller
							
							
							
							
							
						 | 
						
							2019-04-17 13:04:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								627e5a0a49
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/database-compaction
							
							
							
							
							
						 | 
						
							2019-04-17 12:22:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								27d78dc526
								
							
						 | 
						
							
							
								
								Use User.get_cached_by*
							
							
							
							
							
						 | 
						
							2019-04-15 12:37:49 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								589629cf3e
								
							
						 | 
						
							
							
								
								Used cached user resources in subscriptions
							
							
							
							
							
						 | 
						
							2019-04-08 15:56:14 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ca91cbb87
								
							
						 | 
						
							
							
								
								Change relationship direction of subscriptions
							
							
							
							
							
						 | 
						
							2019-04-05 17:02:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								af0065a71f
								
							
						 | 
						
							
							
								
								mastodon_api_controller.ex: Add pleroma-tan to initial_state
							
							
							
							
							
						 | 
						
							2019-04-04 09:07:25 +02: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c8abef373b
								
							
						 | 
						
							
							
								
								mastodon_api_controller.ex: fallback to first for min_id
							
							
							
							
							
						 | 
						
							2019-03-28 17:23:21 +01: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6f15224053
								
							
						 | 
						
							
							
								
								activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
							
							
							
							
							
						 | 
						
							2019-03-28 17:18:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd90695a34
								
							
						 | 
						
							
							
								
								Add PUT /api/pleroma/notification_settings endpoint
							
							
							
							
							
						 | 
						
							2019-03-28 18:55:16 +03: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 | 
						
						
							
							
							
								
							
							
						 |