lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								184ae60b21 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/pleroma-email-naming' into 'develop'  
							
							 
							
							... 
							
							
							
							Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029  
							
						 
						
							2019-04-12 10:41:09 +00: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cae0231731 
								
							 
						 
						
							
							
								
								s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/  
							
							 
							
							
							
						 
						
							2019-04-10 06:33:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1791ee8ec4 
								
							 
						 
						
							
							
								
								s/Pleroma.Mailer/Pleroma.Emails.Mailer/  
							
							 
							
							
							
						 
						
							2019-04-10 06:33:19 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fe5145eeaa 
								
							 
						 
						
							
							
								
								Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex  
							
							 
							
							
							
						 
						
							2019-04-01 12:25:53 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d866b59eea 
								
							 
						 
						
							
							
								
								oof  
							
							 
							
							
							
						 
						
							2019-04-01 11:58:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								45ba10bf47 
								
							 
						 
						
							
							
								
								Fix the issue with HTML scrubber  
							
							 
							
							
							
						 
						
							2019-04-01 11:55:59 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cd387f8693 
								
							 
						 
						
							
							
								
								Add a fake option to lazy_put_actvity_defaults  
							
							 
							
							
							
						 
						
							2019-03-30 13:57:54 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1bb4d5d65b 
								
							 
						 
						
							
							
								
								Implement fake status submit  
							
							 
							
							
							
						 
						
							2019-03-29 21:59:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6f15224053 
								
							 
						 
						
							
							
								
								activity_pub.ex: Move limit/max_id restrictions to Pagination helpers  
							
							 
							
							
							
						 
						
							2019-03-28 17:18:59 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ce6d64bbd8 
								
							 
						 
						
							
							
								
								Fix missing announces in MastoAPI home timeline  
							
							 
							
							... 
							
							
							
							Closes  #762  
							
						 
						
							2019-03-27 12:28:53 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								568e348588 
								
							 
						 
						
							
							
								
								Increment replies_count on replies (MastoAPI)  
							
							 
							
							
							
						 
						
							2019-03-26 15:27:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ce47eb8b29 
								
							 
						 
						
							
							
								
								activitypub: when fetching objects, use the preloaded object from the synthesized activity  
							
							 
							
							
							
						 
						
							2019-03-23 03:05:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								73efe95368 
								
							 
						 
						
							
							
								
								activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)  
							
							 
							
							
							
						 
						
							2019-03-23 01:09:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ba7299fc87 
								
							 
						 
						
							
							
								
								activitypub: add missing with_preloaded_object()  
							
							 
							
							
							
						 
						
							2019-03-23 00:53:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e4307cadc8 
								
							 
						 
						
							
							
								
								activitypub: splice in the child object if we have one  
							
							 
							
							
							
						 
						
							2019-03-23 00:40:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9aea7cc224 
								
							 
						 
						
							
							
								
								activitypub: preload child objects when fetching timelines  
							
							 
							
							
							
						 
						
							2019-03-23 00:10:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								6d6f48d079 
								
							 
						 
						
							
							
								
								Merge branch 'feature/federated-flags' into 'develop'  
							
							 
							
							... 
							
							
							
							Federated reports
See merge request pleroma/pleroma!935  
							
						 
						
							2019-03-16 19:27:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								d8244c2a1b 
								
							 
						 
						
							
							
								
								remove unused function  
							
							 
							
							
							
						 
						
							2019-03-15 15:03:03 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								423fd07928 
								
							 
						 
						
							
							
								
								activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable  
							
							 
							
							
							
						 
						
							2019-03-14 19:52:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5c7b774f09 
								
							 
						 
						
							
							
								
								reports: unify sending e-mail for both remote and local reports  
							
							 
							
							
							
						 
						
							2019-03-14 19:44:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								64b0120d67 
								
							 
						 
						
							
							
								
								activitypub: add support for forwarding reports  
							
							 
							
							
							
						 
						
							2019-03-14 19:36:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								34fc0dca2e 
								
							 
						 
						
							
							
								
								Merge branch 'hotfix/delete-activities' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix delete activities not federating
See merge request pleroma/pleroma!933  
							
						 
						
							2019-03-14 17:49:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e630e5e135 
								
							 
						 
						
							
							
								
								Fix delete activities not federating  
							
							 
							
							
							
						 
						
							2019-03-14 20:43:14 +03: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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c42d34b2ec 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.MaxLineLength  
							
							 
							
							
							
						 
						
							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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								6038c8a753 
								
							 
						 
						
							
							
								
								Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec  
							
							 
							
							
							
						 
						
							2019-03-11 09:02:03 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c2faae70df 
								
							 
						 
						
							
							
								
								Adjust delete activity audience to match the deleted object  
							
							 
							
							
							
						 
						
							2019-03-07 12:26:03 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								6a69ece437 
								
							 
						 
						
							
							
								
								Revert existing object check  
							
							 
							
							
							
						 
						
							2019-03-07 11:53:15 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								28d5b40d0a 
								
							 
						 
						
							
							
								
								Add handling of objects not in database  
							
							 
							
							
							
						 
						
							2019-03-05 23:15:22 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								1445dc25d4 
								
							 
						 
						
							
							
								
								fix format  
							
							 
							
							
							
						 
						
							2019-03-04 11:18:45 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								aab86698a5 
								
							 
						 
						
							
							
								
								Expand "to" of delete activities  
							
							 
							
							
							
						 
						
							2019-03-04 11:18:45 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c93479c6f5 
								
							 
						 
						
							
							
								
								Merge branch 'count-only-public-statuses' into 'develop'  
							
							 
							
							... 
							
							
							
							Increment user note count only on public activities #703 
See merge request pleroma/pleroma!884  
							
						 
						
							2019-03-03 15:49:19 +00: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								9b63fda9c7 
								
							 
						 
						
							
							
								
								Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'  
							
							 
							
							... 
							
							
							
							[#675 ] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877  
							
						 
						
							2019-03-03 11:13:59 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								c46950d3b1 
								
							 
						 
						
							
							
								
								Increment user note count only on public activities  
							
							 
							
							
							
						 
						
							2019-03-03 14:08:43 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								689b0730f8 
								
							 
						 
						
							
							
								
								activitypub: fix date header format  
							
							 
							
							... 
							
							
							
							HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01). 
							
						 
						
							2019-03-01 12:22:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1341ee650e 
								
							 
						 
						
							
							
								
								[ #675 ] Do not show DMs in mentions timeline  
							
							 
							
							
							
						 
						
							2019-03-01 09:37:29 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c4235f96bd 
								
							 
						 
						
							
							
								
								Add with_muted param.  
							
							 
							
							
							
						 
						
							2019-02-27 16:37:42 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9e0686efa6 
								
							 
						 
						
							
							
								
								Move visibility into own module.  
							
							 
							
							
							
						 
						
							2019-02-22 13:29:52 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								62296f5a25 
								
							 
						 
						
							
							
								
								Fix private post card handling.  
							
							 
							
							
							
						 
						
							2019-02-22 12:02:51 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f8a72f2997 
								
							 
						 
						
							
							
								
								activitypub: sign http date header  
							
							 
							
							
							
						 
						
							2019-02-21 00:23:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								bff9eb5ef7 
								
							 
						 
						
							
							
								
								Reports  
							
							 
							
							
							
						 
						
							2019-02-20 16:51:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								5a46d37af9 
								
							 
						 
						
							
							
								
								Update the mute implementation to the current codebase  
							
							 
							
							... 
							
							
							
							Make it part of the info thing (and do a migration to ensure it's there) 
							
						 
						
							2019-02-19 23:09:16 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								f41f017bbc 
								
							 
						 
						
							
							
								
								Implement muting, add it to the mastodon API  
							
							 
							
							
							
						 
						
							2019-02-19 21:49:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								f25a3f4f78 
								
							 
						 
						
							
							
								
								Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'  
							
							 
							
							... 
							
							
							
							properly check for follower address in is_private?
See merge request pleroma/pleroma!841  
							
						 
						
							2019-02-19 14:08:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								96dcacade1 
								
							 
						 
						
							
							
								
								properly check for follower address in is_private?  
							
							 
							
							
							
						 
						
							2019-02-19 13:23:13 +03:00