kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								0ab563d334
								
							
						 | 
						
							
							
								
								Merge branch 'hotfix/fix_undefined_summary' into 'develop'
							
							
							
							
							
							
							
							transmogrifier.ex: Add fix_summary/1
See merge request pleroma/pleroma!1039 
							
						 | 
						
							2019-04-10 02:10:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cf9ba8fe1b
								
							
						 | 
						
							
							
								
								transmogrifier.ex: Add fix_summary/1
							
							
							
							
							
							
							
							MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway. 
							
						 | 
						
							2019-04-10 02:32:04 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								e19590c93f
								
							
						 | 
						
							
							
								
								Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
							
							
							
							
							
							
							
							Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019 
							
						 | 
						
							2019-04-08 11:42:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								36c0a10fdf
								
							
						 | 
						
							
							
								
								adding language tag
							
							
							
							
							
						 | 
						
							2019-04-08 11:03:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								cfa6e7289f
								
							
						 | 
						
							
							
								
								Improve Transmogrifier.upgrade_user_from_ap_id/2
							
							
							
							
							
						 | 
						
							2019-04-04 16:10:43 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								0cb94cfa94
								
							
						 | 
						
							
							
								
								Merge branch 'fix-slow-relationships' into 'develop'
							
							
							
							
							
							
							
							ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011 
							
						 | 
						
							2019-04-02 18:43:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								a79ce94dd4
								
							
						 | 
						
							
							
								
								Merge branch 'feature/fake-statuses' into 'develop'
							
							
							
							
							
							
							
							Add fake status submit
See merge request pleroma/pleroma!995 
							
						 | 
						
							2019-04-02 14:17:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								39bcf93007
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
							
							
							
							
							
						 | 
						
							2019-04-02 16:10:38 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd07745d1b
								
							
						 | 
						
							
							
								
								ActivityPub Utils: Greatly speed up the follow / block activity fetching.
							
							
							
							
							
						 | 
						
							2019-04-02 16:08:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								4212527928
								
							
						 | 
						
							
							
								
								change Repo.get(Activity, id) => Activity.get_by_id(id)
							
							
							
							
							
						 | 
						
							2019-04-02 16:50:31 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe5145eeaa
								
							
						 | 
						
							
							
								
								Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex
							
							
							
							
							
						 | 
						
							2019-04-01 12:25:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								975482f091
								
							
						 | 
						
							
							
								
								insert object defaults for fake activities and make credo happy
							
							
							
							
							
						 | 
						
							2019-04-01 12:16:51 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce6d64bbd8
								
							
						 | 
						
							
							
								
								Fix missing announces in MastoAPI home timeline
							
							
							
							
							
							
							
							Closes #762 
							
						 | 
						
							2019-03-27 12:28:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff3b09f6b3
								
							
						 | 
						
							
							
								
								Merge branch 'fix/ap-icon' into 'develop'
							
							
							
							
							
							
							
							Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977 
							
						 | 
						
							2019-03-26 16:12:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								10a7a4a868
								
							
						 | 
						
							
							
								
								AP UserView: Refactor banner / avatar display code, add test.
							
							
							
							
							
						 | 
						
							2019-03-26 16:59:28 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								568e348588
								
							
						 | 
						
							
							
								
								Increment replies_count on replies (MastoAPI)
							
							
							
							
							
						 | 
						
							2019-03-26 15:27:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								c410296120
								
							
						 | 
						
							
							
								
								Try sending an empty map
							
							
							
							
							
						 | 
						
							2019-03-25 19:00:35 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								6f090f981b
								
							
						 | 
						
							
							
								
								Attempt to fix incorrect federation of default instance avatars
							
							
							
							
							
						 | 
						
							2019-03-25 18:47:04 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								750de7d842
								
							
						 | 
						
							
							
								
								Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
							
							
							
							
							
							
							
							mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968 
							
						 | 
						
							2019-03-24 15:02:13 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								eab9425cc4
								
							
						 | 
						
							
							
								
								mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
							
							
							
							
							
						 | 
						
							2019-03-24 15:47:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								8c70156157
								
							
						 | 
						
							
							
								
								activitypub: object view: use preloaded object when possible
							
							
							
							
							
						 | 
						
							2019-03-23 03:05:14 +00: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								4cedf45423
								
							
						 | 
						
							
							
								
								relay: use preloaded object since we always have it
							
							
							
							
							
						 | 
						
							2019-03-23 02:28:56 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								1685e4258f
								
							
						 | 
						
							
							
								
								transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
							
							
							
							
							
						 | 
						
							2019-03-19 18:39:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd055983c3
								
							
						 | 
						
							
							
								
								transmogrifier: when determining followers collection URI, we may need to fetch the actor
							
							
							
							
							
						 | 
						
							2019-03-19 18:04:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								d487b753c3
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
							
							
							
							
							
						 | 
						
							2019-03-19 17:30:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								798da28812
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: ensure as:Public activities are delivered to followers
							
							
							
							
							
						 | 
						
							2019-03-19 17:27:42 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								379442ad17
								
							
						 | 
						
							
							
								
								activitypub: utils: also match Activity objects
							
							
							
							
							
						 | 
						
							2019-03-14 19:29:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f3ecb2bfb
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: accept remote Flag activities
							
							
							
							
							
						 | 
						
							2019-03-14 19:06:02 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								f86f7dbb8f
								
							
						 | 
						
							
							
								
								activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs
							
							
							
							
							
						 | 
						
							2019-03-14 19:05:42 +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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c3d41b2b6e
								
							
						 | 
						
							
							
								
								[Credo] make all variables use snake_case
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:56 +01:00 | 
						
						
							
							
							
								
							
							
						 |