lain 
								
							 
						 
						
							
							
							
							
								
							
							
								203d61b950 
								
							 
						 
						
							
							
								
								Transmogrifier: Make proper use of the LikeValidator.  
							
							
							
						 
						
							2019-10-17 19:35:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								66452f518f 
								
							 
						 
						
							
							
								
								ObjectValidator: Rewrite LikeValidator with Ecto.  
							
							
							
						 
						
							2019-10-17 18:36:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								081e8206ab 
								
							 
						 
						
							
							
								
								Transmogrifier: Use new ingestion pipeline for Likes.  
							
							
							
						 
						
							2019-10-16 17:03:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6e4f52f8a2 
								
							 
						 
						
							
							
								
								Introduce new ingestion pipeline structure, implement internal Likes with it.  
							
							
							
						 
						
							2019-10-16 16:16:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e3b4a3e96b 
								
							 
						 
						
							
							
								
								Merge branch 'incoming-id-fixes' into 'develop'  
							
							... 
							
							
							
							Assorted transmogrifier fixes
See merge request pleroma/pleroma!1831  
							
						 
						
							2019-10-13 15:37:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9bdbf0811b 
								
							 
						 
						
							
							
								
								Make MediaProxy failure tracking less brutal  
							
							... 
							
							
							
							The current failure tracking mechanism will never request anything that
didn't respond with a success, 403, 404, or 5xx codes. This is causing
issues when using in real fediverse because of weird status codes
some software has and timeouts being frequent. This patch changes
failure tracking mechanism to only never request the url again if it
responded with 400, 204, or the body is too large, otherwise it can be
re-requested in 60 seconds. 
							
						 
						
							2019-10-11 22:52:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								422aa6befe 
								
							 
						 
						
							
							
								
								Ostatus DeleteHandler: Fix for new option format.  
							
							
							
						 
						
							2019-10-11 12:53:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								37812740c4 
								
							 
						 
						
							
							
								
								Transmogrifier: Correctly save incoming ids for Accept/Reject.  
							
							
							
						 
						
							2019-10-11 11:48:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9b963064eb 
								
							 
						 
						
							
							
								
								Transmogrifier: Actually store who deleted a note.  
							
							
							
						 
						
							2019-10-11 11:25:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								29647dfd09 
								
							 
						 
						
							
							
								
								Transmogrifier: Save correct ids for incoming deletes.  
							
							
							
						 
						
							2019-10-10 17:17:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								580a67f5ca 
								
							 
						 
						
							
							
								
								Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id)  
							
							
							
						 
						
							2019-10-09 07:27:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								9a2f71f4d5 
								
							 
						 
						
							
							
								
								mastodon api: fix exclude_replies ( closes   #1287 )  
							
							
							
						 
						
							2019-10-07 12:29:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								4b3f77a99f 
								
							 
						 
						
							
							
								
								Extract RSS Feed functionality from OStatus  
							
							
							
						 
						
							2019-10-07 12:20:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								93bdc55306 
								
							 
						 
						
							
							
								
								Merge branch 'mrf/simple_policy/check_actor' into 'develop'  
							
							... 
							
							
							
							mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806  
							
						 
						
							2019-10-07 10:19:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								28fb98d69e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2019-10-07 11:06:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								b4f3c16885 
								
							 
						 
						
							
							
								
								Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'  
							
							... 
							
							
							
							[#1234 ] Mastodon 2.4.3 hierarchical OAuth scopes
Closes  #1234 
See merge request pleroma/pleroma!1643  
							
						 
						
							2019-10-07 02:14:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								58aeabd020 
								
							 
						 
						
							
							
								
								mrf/simple_policy: check actor against accept/reject  
							
							
							
						 
						
							2019-10-07 03:49:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								2411d09215 
								
							 
						 
						
							
							
								
								Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'  
							
							... 
							
							
							
							Move local keys out of `user.info`
See merge request pleroma/pleroma!1799  
							
						 
						
							2019-10-06 14:32:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								1d8e956c32 
								
							 
						 
						
							
							
								
								Use the user.id instead of nickname in report URLs  
							
							... 
							
							
							
							Ensures links to profiles of remote users work. 
							
						 
						
							2019-10-06 14:13:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b93856874d 
								
							 
						 
						
							
							
								
								[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex 
							
						 
						
							2019-10-06 17:12:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fefbd31c6e 
								
							 
						 
						
							
							
								
								Move local keys out of user.info  
							
							
							
						 
						
							2019-10-06 16:56:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								06b3bb54c5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex 
							
						 
						
							2019-10-06 11:43:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f459aabdfa 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2019-10-06 09:30:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								9e34919dcd 
								
							 
						 
						
							
							
								
								Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'  
							
							... 
							
							
							
							Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597  
							
						 
						
							2019-10-06 04:41:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								7a318d74e6 
								
							 
						 
						
							
							
								
								Merge branch 'split-masto-api/leftovers' into 'develop'  
							
							... 
							
							
							
							[#1278 ] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761  
							
						 
						
							2019-10-05 19:28:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								45b7f03f89 
								
							 
						 
						
							
							
								
								Merge branch 'accept-embedded-announce-object' into 'develop'  
							
							... 
							
							
							
							Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770  
							
						 
						
							2019-10-05 19:28:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								17ff4b43cb 
								
							 
						 
						
							
							
								
								Merge branch 'unread-conversation-count' into 'develop'  
							
							... 
							
							
							
							Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796  
							
						 
						
							2019-10-05 19:28:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								8249924485 
								
							 
						 
						
							
							
								
								Mastodon API: Add pleroma.unread_conversation_count to the Account entity  
							
							
							
						 
						
							2019-10-05 20:12:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								276a520163 
								
							 
						 
						
							
							
								
								CommonAPI: Create profile updates as public.  
							
							... 
							
							
							
							This saves us lots of sending out because we can use sharedInbox. 
							
						 
						
							2019-10-05 14:53:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4b8524f392 
								
							 
						 
						
							
							
								
								ActivityPub / Transmogrifier: Correctly store incoming Update id.  
							
							
							
						 
						
							2019-10-05 14:49:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								791d93ff0e 
								
							 
						 
						
							
							
								
								Make credo happy  
							
							
							
						 
						
							2019-10-05 13:56:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								977e711e22 
								
							 
						 
						
							
							
								
								Import object from self-Announce whenever possible  
							
							
							
						 
						
							2019-10-05 13:56:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e07e9cb75e 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !1737  
							
						 
						
							2019-10-05 10:00:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								83631752af 
								
							 
						 
						
							
							
								
								removed legacy api: "/objects/:uuid/likes"  
							
							
							
						 
						
							2019-10-04 22:35:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e0c0ea9f13 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/widen-streamer-blocks' into 'develop'  
							
							... 
							
							
							
							widen streaming API block effects
See merge request pleroma/pleroma!1784  
							
						 
						
							2019-10-04 17:39:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								5c04e81724 
								
							 
						 
						
							
							
								
								Merge branch 'user-info-unread-direct-conversation' into 'develop'  
							
							... 
							
							
							
							Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737  
							
						 
						
							2019-10-04 17:33:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								d1d058bf85 
								
							 
						 
						
							
							
								
								streamer: worker: actually use should_send? consistently  
							
							
							
						 
						
							2019-10-04 15:42:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								5a0c018d2a 
								
							 
						 
						
							
							
								
								streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist  
							
							
							
						 
						
							2019-10-04 15:41:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								2417b633ed 
								
							 
						 
						
							
							
								
								streamer: add missing copyright headers  
							
							
							
						 
						
							2019-10-04 15:21:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								568a995d64 
								
							 
						 
						
							
							
								
								ActivityPub: Change addressing of Undo.  
							
							
							
						 
						
							2019-10-04 16:32:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								27110793a7 
								
							 
						 
						
							
							
								
								Merge branch 'featrue/job-monitor' into 'develop'  
							
							... 
							
							
							
							Add Pleroma.JobQueueMonitor
Closes  #1274 
See merge request pleroma/pleroma!1721  
							
						 
						
							2019-10-04 12:52:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								27e914955e 
								
							 
						 
						
							
							
								
								Merge branch 'fix/nickname-fail' into 'develop'  
							
							... 
							
							
							
							Fix get_cached_by_nickname_or_id not allowing to get local users by nickname
Closes  #1293 
See merge request pleroma/pleroma!1777  
							
						 
						
							2019-10-04 11:54:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								8217292085 
								
							 
						 
						
							
							
								
								Fix get_cached_by_nickname_or_id not allowing to get local users by  
							
							... 
							
							
							
							nickname
Closes  #1293  
							
						 
						
							2019-10-04 14:44:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								01da6344b9 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/notification-nil-actor' into 'develop'  
							
							... 
							
							
							
							notification_view.ex: Make sure `account` isn’t empty
See merge request pleroma/pleroma!1779  
							
						 
						
							2019-10-04 11:28:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d3ac4e8083 
								
							 
						 
						
							
							
								
								Fix OAuthController  
							
							
							
						 
						
							2019-10-04 13:30:46 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5dc14c89ce 
								
							 
						 
						
							
							
								
								notification_view.ex: Make sure account isn’t empty  
							
							... 
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1203  
							
						 
						
							2019-10-04 07:11:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								06d9df79c5 
								
							 
						 
						
							
							
								
								Mastodon API: Add pleroma.unread_conversation_count to the Account entity  
							
							
							
						 
						
							2019-10-04 00:53:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								64095961fe 
								
							 
						 
						
							
							
								
								[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex 
							
						 
						
							2019-10-02 20:42:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e0c68eeb02 
								
							 
						 
						
							
							
								
								Move :favourites and :bookmarks actions to StatusController  
							
							
							
						 
						
							2019-10-02 21:31:19 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7f2bc57725 
								
							 
						 
						
							
							
								
								Move follows, mutes and blocks actions to AccountController  
							
							
							
						 
						
							2019-10-02 21:22:21 +07:00