kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								d120aa63f0 
								
							 
						 
						
							
							
								
								Merge branch 'fix-dm-index' into 'develop'  
							
							... 
							
							
							
							Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772  
							
						 
						
							2019-02-05 20:27:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								681ba1e52f 
								
							 
						 
						
							
							
								
								Merge branch 'feature/ap-c2s-whoami' into 'develop'  
							
							... 
							
							
							
							activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773  
							
						 
						
							2019-02-05 20:26:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								eb2b1960e0 
								
							 
						 
						
							
							
								
								Merge branch 'feature/split-hide-network-v2' into 'develop'  
							
							... 
							
							
							
							Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765  
							
						 
						
							2019-02-05 18:56:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e71ab5a10f 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: fix bare tags  
							
							
							
						 
						
							2019-02-05 00:43:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								db1165f70f 
								
							 
						 
						
							
							
								
								activitypub: c2s: add /api/ap/whoami endpoint for andstatus  
							
							
							
						 
						
							2019-02-04 22:58:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f3c8b02d65 
								
							 
						 
						
							
							
								
								Massage index until it actually does the stuff we want.  
							
							... 
							
							
							
							Also makes the index a lot smoler. 
							
						 
						
							2019-02-04 23:47:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7d110be119 
								
							 
						 
						
							
							
								
								activitypub: mrf: tag policy: fix force-unlisted and sandbox actions  
							
							
							
						 
						
							2019-02-04 19:03:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								64a3993425 
								
							 
						 
						
							
							
								
								activitypub: mrf: tag policy: add support for subscription control  
							
							
							
						 
						
							2019-02-04 17:48:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ff2c28fd6d 
								
							 
						 
						
							
							
								
								activitypub: mrf: tag policy: refactor the filtering hook a bit  
							
							
							
						 
						
							2019-02-04 17:06:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9a69f08e86 
								
							 
						 
						
							
							
								
								activitypub: mrf: tag policy: add support for processing follow requests  
							
							
							
						 
						
							2019-02-04 17:04:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								084bb8ccd5 
								
							 
						 
						
							
							
								
								activitypub: mrf: tag policy: implement force-unlisted and sandbox  
							
							
							
						 
						
							2019-02-04 17:04:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								88e32a32ce 
								
							 
						 
						
							
							
								
								mrf: add initial MRF.TagPolicy engine  
							
							
							
						 
						
							2019-02-04 17:04:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								3a3a3996b7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex 
							
						 
						
							2019-02-04 20:50:28 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								89762ad230 
								
							 
						 
						
							
							
								
								Merge branch 'feature/hellthread-filter-improvements' into 'develop'  
							
							... 
							
							
							
							Improve hellthread filter
Closes  #584 
See merge request pleroma/pleroma!766  
							
						 
						
							2019-02-04 12:36:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								58262a8b8a 
								
							 
						 
						
							
							
								
								removed a debug thingy  
							
							
							
						 
						
							2019-02-04 11:22:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								4430641349 
								
							 
						 
						
							
							
								
								squished a bug  
							
							
							
						 
						
							2019-02-04 12:09:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								3cf046babb 
								
							 
						 
						
							
							
								
								actually commited the changes  
							
							
							
						 
						
							2019-02-04 10:23:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								63a4f4b7be 
								
							 
						 
						
							
							
								
								fixed Map,put arguments, updated nomenclature  
							
							
							
						 
						
							2019-02-04 10:23:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								583c4e0f17 
								
							 
						 
						
							
							
								
								more tweaks, fixed silly mistakes...  
							
							
							
						 
						
							2019-02-03 23:56:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								e10cda7541 
								
							 
						 
						
							
							
								
								implemented tweaks  
							
							
							
						 
						
							2019-02-03 22:46:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								531507a635 
								
							 
						 
						
							
							
								
								fixed things  
							
							
							
						 
						
							2019-02-03 20:45:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								10130fa7d6 
								
							 
						 
						
							
							
								
								made toggleable, added docs  
							
							
							
						 
						
							2019-02-03 20:27:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								0ef0ae35ab 
								
							 
						 
						
							
							
								
								added optional delist feature  
							
							
							
						 
						
							2019-02-03 20:12:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								16ce129e38 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings (fixed)  
							
							
							
						 
						
							2019-02-03 21:55:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								69a38644bc 
								
							 
						 
						
							
							
								
								Merge branch '589-fix-cache' into 'develop'  
							
							... 
							
							
							
							Resolve "Update object cache on favs/boosts"
Closes  #589 
See merge request pleroma/pleroma!764  
							
						 
						
							2019-02-03 18:19:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								505a084058 
								
							 
						 
						
							
							
								
								Still do caching in tests.  
							
							
							
						 
						
							2019-02-03 18:28:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3913b0196e 
								
							 
						 
						
							
							
								
								[ #582 ] Made single-pub task call Instance.set_reachable/1 if set_reachable is not specified.  
							
							... 
							
							
							
							Added tests. 
							
						 
						
							2019-02-03 13:28:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b40b4bc4e5 
								
							 
						 
						
							
							
								
								[ #582 ] Optimized federation retirement by reducing the number of SQL calls  
							
							... 
							
							
							
							(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`). 
							
						 
						
							2019-02-03 12:41:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								486749064f 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/split-hide-network' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !733  
							
						 
						
							2019-02-01 20:22:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0a82a7e6d6 
								
							 
						 
						
							
							
								
								Merge branch 'feature/split-hide-network' into 'develop'  
							
							... 
							
							
							
							Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733  
							
						 
						
							2019-02-01 17:05:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								b3b0855456 
								
							 
						 
						
							
							
								
								Merge branch '534_federation_targets_reachability' into 'develop'  
							
							... 
							
							
							
							[#534 ] Unreachable federation targets retirement
Closes  #534 
See merge request pleroma/pleroma!703  
							
						 
						
							2019-02-01 09:14:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								d3677d2b4d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'MAIN/develop' into feature/jobs  
							
							
							
						 
						
							2019-01-31 15:07:49 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								57549f6043 
								
							 
						 
						
							
							
								
								activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target  
							
							
							
						 
						
							2019-01-29 12:21:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb2b709de 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: fix follow request rejections  
							
							
							
						 
						
							2019-01-29 11:57:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								92753b0cd9 
								
							 
						 
						
							
							
								
								[ #534 ] Made federation push sender be determined basing on content instead of referer header. Updated tests.  
							
							
							
						 
						
							2019-01-29 13:12:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								50d6183893 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings  
							
							
							
						 
						
							2019-01-28 21:40:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								55affbca7f 
								
							 
						 
						
							
							
								
								add a job queue  
							
							
							
						 
						
							2019-01-28 22:17:17 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d3f9e6f6fe 
								
							 
						 
						
							
							
								
								[ #534 ] Merged upstream/develop.  
							
							
							
						 
						
							2019-01-28 15:39:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1d2f41642c 
								
							 
						 
						
							
							
								
								[ #534 ] Various tweaks. Tests for Instances and Instance.  
							
							
							
						 
						
							2019-01-28 15:25:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9560abea10 
								
							 
						 
						
							
							
								
								[ #534 ] Refactoring / tweaks per MR review.  
							
							
							
						 
						
							2019-01-28 11:03:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								91ef64a1ec 
								
							 
						 
						
							
							
								
								activitypub: prime OGP crawler cache when new messages are inserted into the database  
							
							
							
						 
						
							2019-01-28 06:07:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ea12371a01 
								
							 
						 
						
							
							
								
								Merge branch 'discard-invalid-likes' into 'develop'  
							
							... 
							
							
							
							Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724  
							
						 
						
							2019-01-27 19:10:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77f2137383 
								
							 
						 
						
							
							
								
								Transmogrifier: fix incoming objects with invalid likes  
							
							
							
						 
						
							2019-01-27 19:33:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								5eb81d2c72 
								
							 
						 
						
							
							
								
								Merge branch 'features/mastoapi-multi-hashtag' into 'develop'  
							
							... 
							
							
							
							MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652  
							
						 
						
							2019-01-27 12:45:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a84def6a6 
								
							 
						 
						
							
							
								
								Fix the logic in multi-hashtag TLs  
							
							
							
						 
						
							2019-01-26 04:46:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4ad0ad14ed 
								
							 
						 
						
							
							
								
								Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests  
							
							
							
						 
						
							2019-01-26 04:46:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1a9bb4daa0 
								
							 
						 
						
							
							
								
								[Web.ActivityPub.ActivityPub]: Fix restrict_tag()  
							
							... 
							
							
							
							Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching 
							
						 
						
							2019-01-26 04:46:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f9cae0d04f 
								
							 
						 
						
							
							
								
								[WIP,MastoAPI] Multi-tag timelines  
							
							
							
						 
						
							2019-01-26 04:45:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								15aa45ae8a 
								
							 
						 
						
							
							
								
								Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil  
							
							
							
						 
						
							2019-01-26 03:50:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								4c99b6d35a 
								
							 
						 
						
							
							
								
								Merge branch 'fix/tusky-dm' into 'develop'  
							
							... 
							
							
							
							Add actor to recipients list
Closes  #390 
See merge request pleroma/pleroma!683  
							
						 
						
							2019-01-25 05:19:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								4df71cd88b 
								
							 
						 
						
							
							
								
								Merge branch 'classic-flakeids' into 'develop'  
							
							... 
							
							
							
							Flake Ids for Users and Activities
Closes  #450 
See merge request pleroma/pleroma!645  
							
						 
						
							2019-01-25 04:59:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3e9399ec0b 
								
							 
						 
						
							
							
								
								[ #534 ] Optimized bulk publish ops to filter on reachability early. Instance refactoring.  
							
							
							
						 
						
							2019-01-24 19:15:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8654a591f0 
								
							 
						 
						
							
							
								
								[ #534 ] Updating external instances reachability on incoming federation.  
							
							
							
						 
						
							2019-01-24 17:37:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								54ec6d09b0 
								
							 
						 
						
							
							
								
								mrf: add anti-followbot policy  
							
							
							
						 
						
							2019-01-24 09:35:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								20b54366ee 
								
							 
						 
						
							
							
								
								[ #534 ] Federation publish requests status control (enforced 2xx response code check).  
							
							
							
						 
						
							2019-01-24 11:54:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f161a92cb1 
								
							 
						 
						
							
							
								
								[ #534 ] Initial implementation of unreachable federation targets retirement.  
							
							
							
						 
						
							2019-01-23 18:37:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2de208817c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into rename/pleroma_activity_consistency  
							
							
							
						 
						
							2019-01-23 13:05:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cdc5e6ff5c 
								
							 
						 
						
							
							
								
								ActivityPub: restrict_since/restrict_max: ignore empty param  
							
							
							
						 
						
							2019-01-23 11:26:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								28d77e373c 
								
							 
						 
						
							
							
								
								Flake Ids for Users and Activities  
							
							
							
						 
						
							2019-01-23 11:26:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								8cd853ce0c 
								
							 
						 
						
							
							
								
								Merge branch '530_federator_user_info_overwrite_fix' into 'develop'  
							
							... 
							
							
							
							[#530 ] Prevents user `info` from being overwritten because of race conditions
Closes  #530 
See merge request pleroma/pleroma!691  
							
						 
						
							2019-01-21 13:03:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								69454c8345 
								
							 
						 
						
							
							
								
								Merge branch 'feature/dm-sanity' into 'develop'  
							
							... 
							
							
							
							DM sanitization
See merge request pleroma/pleroma!458  
							
						 
						
							2019-01-21 12:35:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a4d3fec8a7 
								
							 
						 
						
							
							
								
								[ #502 ] Code comments update.  
							
							
							
						 
						
							2019-01-21 14:52:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								aa480f4a8b 
								
							 
						 
						
							
							
								
								[ #530 ] Prevents user info from being overwritten because of race conditions  
							
							... 
							
							
							
							and non-partial update of embed (in WebFinger.ensure_keys_present and other places). 
							
						 
						
							2019-01-21 14:16:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								98c8184c1f 
								
							 
						 
						
							
							
								
								Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1  
							
							
							
						 
						
							2019-01-21 08:00:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f8ab1b7427 
								
							 
						 
						
							
							
								
								Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1  
							
							
							
						 
						
							2019-01-21 08:00:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b82c6dc536 
								
							 
						 
						
							
							
								
								Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1  
							
							
							
						 
						
							2019-01-21 07:49:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cf1f35a93a 
								
							 
						 
						
							
							
								
								Send delete event over Mastodon streaming api  
							
							... 
							
							
							
							Closes  #116  
						
							2019-01-20 13:00:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								aa37313416 
								
							 
						 
						
							
							
								
								activitypub: short-circuit is_public?() with directMessage flag check  
							
							
							
						 
						
							2019-01-20 02:33:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7c9749f793 
								
							 
						 
						
							
							
								
								transmogrifier: slightly clean up fix_explicit_addressing pipeline  
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								420651157b 
								
							 
						 
						
							
							
								
								transmogrifier: don't apply heuristics against messages which have directMessage set true  
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ddae43eb43 
								
							 
						 
						
							
							
								
								activitypub: add is_private?/is_direct? helpers  
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								681f40ee5c 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs  
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8d06be35e0 
								
							 
						 
						
							
							
								
								activitypub: utils: add determine_explicit_mentions() and tests  
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								42612b1c8d 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/improve-boost-targeting' into 'develop'  
							
							... 
							
							
							
							improve handling of non-public Announces
See merge request pleroma/pleroma!681  
							
						 
						
							2019-01-19 23:44:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								e116e55cab 
								
							 
						 
						
							
							
								
								Add actor to recipients  
							
							
							
						 
						
							2019-01-18 22:40:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								75a9b2a851 
								
							 
						 
						
							
							
								
								activitypub: add a match clause for objects, not just activities  
							
							
							
						 
						
							2019-01-17 23:32:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								dbc4e92509 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: do not clobber the addressing on relayed announcements  
							
							
							
						 
						
							2019-01-17 23:21:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								33b473cc02 
								
							 
						 
						
							
							
								
								activitypub: allow is_public?() to work on any type of map representing an AS2 object  
							
							
							
						 
						
							2019-01-17 23:21:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8e9f1d5587 
								
							 
						 
						
							
							
								
								activitypub: relay: chase selective public announce changes  
							
							
							
						 
						
							2019-01-17 23:21:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2479e88815 
								
							 
						 
						
							
							
								
								activitypub: announce: add new public parameter  
							
							
							
						 
						
							2019-01-17 23:21:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								948fba6f76 
								
							 
						 
						
							
							
								
								Fix bad link in likes collection  
							
							... 
							
							
							
							Don't copy and paste, mkay 
							
						 
						
							2019-01-17 18:21:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								fd2f1258fb 
								
							 
						 
						
							
							
								
								Merge branch 'load-all-dms' into 'develop'  
							
							... 
							
							
							
							Remove recent activity restriction.
See merge request pleroma/pleroma!644  
							
						 
						
							2019-01-14 18:49:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								fa0392e49c 
								
							 
						 
						
							
							
								
								Merge branch 'activitypub-likes' into 'develop'  
							
							... 
							
							
							
							Activitypub c2s likes
See merge request pleroma/pleroma!658  
							
						 
						
							2019-01-14 07:27:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6e5b0406b9 
								
							 
						 
						
							
							
								
								mrf: add no placeholder-text policy, strips pointless "." content from posts with images  
							
							
							
						 
						
							2019-01-14 05:42:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								868034375c 
								
							 
						 
						
							
							
								
								Add likes to activitypub object representation  
							
							... 
							
							
							
							Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total. 
							
						 
						
							2019-01-12 20:24:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								581edd5a91 
								
							 
						 
						
							
							
								
								Add route to get object like activities  
							
							
							
						 
						
							2019-01-12 20:24:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								36711e1c83 
								
							 
						 
						
							
							
								
								Handle client submitted activitypub like activity  
							
							
							
						 
						
							2019-01-12 20:24:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								1eb7318831 
								
							 
						 
						
							
							
								
								Prepare all types objects before serialising  
							
							... 
							
							
							
							Activities returned from inbox can include other types of objects like
Article 
							
						 
						
							2019-01-12 20:24:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e4afe1359b 
								
							 
						 
						
							
							
								
								Merge branch 'activitypub-dereference-activity-id' into 'develop'  
							
							... 
							
							
							
							Support activity+json request for activity
See merge request pleroma/pleroma!641  
							
						 
						
							2019-01-10 18:42:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								7f5efddd6e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/pinned-posts' into 'develop'  
							
							... 
							
							
							
							Pinned Statuses
Closes  #440 
See merge request pleroma/pleroma!636  
							
						 
						
							2019-01-10 02:39:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5027f82cde 
								
							 
						 
						
							
							
								
								Add activity visibility index.  
							
							
							
						 
						
							2019-01-09 16:45:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9854978b8b 
								
							 
						 
						
							
							
								
								Remove recent activity restriction.  
							
							... 
							
							
							
							This should be fine now, everything should be covered by indices. 
							
						 
						
							2019-01-09 12:38:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								20c0dd1e24 
								
							 
						 
						
							
							
								
								Support activity+json request for activity  
							
							
							
						 
						
							2019-01-09 09:33:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								380e9fba21 
								
							 
						 
						
							
							
								
								add pinned posts  
							
							
							
						 
						
							2019-01-07 20:45:33 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								2d7da5f437 
								
							 
						 
						
							
							
								
								Don't crash on AP request for tombstone  
							
							... 
							
							
							
							Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api 
							
						 
						
							2019-01-05 11:16:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								4e1cc2bab6 
								
							 
						 
						
							
							
								
								Implement delete activity  
							
							
							
						 
						
							2019-01-01 23:20:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								551c3d9391 
								
							 
						 
						
							
							
								
								Split create activity specifics from update_outbox  
							
							
							
						 
						
							2019-01-01 23:20:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								096a927805 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into pool-usage  
							
							
							
						 
						
							2019-01-01 14:19:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d4799e0dc2 
								
							 
						 
						
							
							
								
								Remove default pool, it's used automatically anyway.  
							
							
							
						 
						
							2019-01-01 13:49:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								980b5288ed 
								
							 
						 
						
							
							
								
								update copyright years to 2019  
							
							
							
						 
						
							2018-12-31 15:41:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								f40562b4e1 
								
							 
						 
						
							
							
								
								Respond with full activity to outbox post  
							
							
							
						 
						
							2018-12-30 12:01:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								1e781715c8 
								
							 
						 
						
							
							
								
								Limit activity types accepted to outbox to only 'Create'  
							
							
							
						 
						
							2018-12-30 12:01:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								569bad8210 
								
							 
						 
						
							
							
								
								Create activity when client posts to outbox  
							
							
							
						 
						
							2018-12-30 12:01:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								26dc2dddab 
								
							 
						 
						
							
							
								
								Implement ActivityPub inbox view  
							
							... 
							
							
							
							More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported 
							
						 
						
							2018-12-30 12:01:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								aa082ca7b6 
								
							 
						 
						
							
							
								
								Wire up stub routes for client calls of activitypub inbox/outbox  
							
							... 
							
							
							
							Code style: remove wrapping function of outbox 
							
						 
						
							2018-12-29 22:22:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								3dc5f04976 
								
							 
						 
						
							
							
								
								Merge branch 'carrot-bullying' into 'develop'  
							
							... 
							
							
							
							Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595  
							
						 
						
							2018-12-29 11:46:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vyr Cossont 
								
							 
						 
						
							
							
							
							
								
							
							
								e4562105e7 
								
							 
						 
						
							
							
								
								Implement exclude_reblogs and include_rts  
							
							
							
						 
						
							2018-12-26 21:38:00 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5811e65e67 
								
							 
						 
						
							
							
								
								Add some hard limits on inserted activities.  
							
							
							
						 
						
							2018-12-26 12:39:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								71f6d9f418 
								
							 
						 
						
							
							
								
								transmogrifier: significantly rework handling of peertube videos, add test  
							
							
							
						 
						
							2018-12-23 13:31:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								3aff8067e4 
								
							 
						 
						
							
							
								
								transmogrifier: When it’s a Video move "url" to "attachment"  
							
							
							
						 
						
							2018-12-23 13:00:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								a7f07bb6e5 
								
							 
						 
						
							
							
								
								Implement kaniini's tweaks  
							
							
							
						 
						
							2018-12-23 12:24:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c76179419d 
								
							 
						 
						
							
							
								
								Renamed the things  
							
							
							
						 
						
							2018-12-23 11:14:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								409ff60bf8 
								
							 
						 
						
							
							
								
								Fix formatting  
							
							
							
						 
						
							2018-12-22 23:32:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								92362e1e22 
								
							 
						 
						
							
							
								
								Implement large thread filter  
							
							
							
						 
						
							2018-12-22 23:18:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								074fa790ba 
								
							 
						 
						
							
							
								
								fix compile warnings  
							
							
							
						 
						
							2018-12-09 20:50:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								abead01ab6 
								
							 
						 
						
							
							
								
								Merge branch 'correct-and-improve-http-options' into 'develop'  
							
							... 
							
							
							
							Correct and improve http options
See merge request pleroma/pleroma!505  
							
						 
						
							2018-12-06 15:57:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								b0adea30b3 
								
							 
						 
						
							
							
								
								Merge branch 're-mrf' into 'develop'  
							
							... 
							
							
							
							Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499  
							
						 
						
							2018-12-06 15:36:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								d27e3f269f 
								
							 
						 
						
							
							
								
								Rename regular expression 'have_re' to 'reply_prefix'.  
							
							
							
						 
						
							2018-12-06 14:00:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								3dff61ebec 
								
							 
						 
						
							
							
								
								Harden re: detection.  
							
							
							
						 
						
							2018-12-06 13:48:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								6a6aaa0e1a 
								
							 
						 
						
							
							
								
								Use object.normalize.  
							
							
							
						 
						
							2018-12-06 11:37:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								a09ed0f5af 
								
							 
						 
						
							
							
								
								avoid mix format bug  
							
							
							
						 
						
							2018-12-06 18:41:29 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ccf0b46dd6 
								
							 
						 
						
							
							
								
								Merge branch '210_twitter_api_uploads_alt_text' into 'develop'  
							
							... 
							
							
							
							[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496  
							
						 
						
							2018-12-06 07:36:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3e90f688f1 
								
							 
						 
						
							
							
								
								[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.  
							
							... 
							
							
							
							Refactoring. 
							
						 
						
							2018-12-06 10:26:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								96ba95df2e 
								
							 
						 
						
							
							
								
								remove follow_redirect options  
							
							
							
						 
						
							2018-12-06 11:38:33 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								27792b2d77 
								
							 
						 
						
							
							
								
								remove pool and timeout options which duplicate with the default  
							
							
							
						 
						
							2018-12-06 11:23:15 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								76d6b1c6ab 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin' into follower-hiding  
							
							
							
						 
						
							2018-12-05 21:27:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3b5be09f45 
								
							 
						 
						
							
							
								
								[ #210 ] Stylistic change.  
							
							
							
						 
						
							2018-12-05 21:48:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c4f3c5e939 
								
							 
						 
						
							
							
								
								[ #210 ] Stylistic change.  
							
							
							
						 
						
							2018-12-05 20:23:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								848151f7cb 
								
							 
						 
						
							
							
								
								[ #210 ] [TwitterAPI] Made actor be stored for uploads. Added ownership check  
							
							... 
							
							
							
							to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring. 
							
						 
						
							2018-12-05 13:37:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								8a1df182cf 
								
							 
						 
						
							
							
								
								Add a MRF Policy for appending re: to identical subjects in replies.  
							
							
							
						 
						
							2018-12-04 23:35:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								114b95cee2 
								
							 
						 
						
							
							
								
								Merge branch 'feature/integration_tesla' into 'develop'  
							
							... 
							
							
							
							[#354 ] Move all http interactions to Tesla
See merge request pleroma/pleroma!487  
							
						 
						
							2018-12-04 18:41:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b57d83e3c9 
								
							 
						 
						
							
							
								
								MRF: simple policy: fix media removal  
							
							
							
						 
						
							2018-12-04 18:30:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								87109482f3 
								
							 
						 
						
							
							
								
								status_code -> status  
							
							
							
						 
						
							2018-12-04 14:04:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b3b52b58c3 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: remove obsolete fetch_obj_helper()  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f85949cc69 
								
							 
						 
						
							
							
								
								object: factor out fetching functions into Pleroma.Object.Fetcher module  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e8caecb5c7 
								
							 
						 
						
							
							
								
								object: move object containment out of transmogrifier into it's own module  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6f90f2c3ac 
								
							 
						 
						
							
							
								
								activitypub: rework thread filtering for split object view  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								cf139e3eec 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: ensure we send nested object in Create  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d13d953385 
								
							 
						 
						
							
							
								
								activitypub: implement activity flattening  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								57d90e7afe 
								
							 
						 
						
							
							
								
								activitypub: relay: fix improper use of Object.normalize()  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4482ce7e2d 
								
							 
						 
						
							
							
								
								activitypub: normalize objects when streaming them out  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6be0ab1e55 
								
							 
						 
						
							
							
								
								Hide network in ap.  
							
							
							
						 
						
							2018-12-02 17:35:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c443c9bd72 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info  
							
							
							
						 
						
							2018-12-01 09:55:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b19597f602 
								
							 
						 
						
							
							
								
								reverse proxy / uploads  
							
							
							
						 
						
							2018-11-30 18:00:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d0ec2812bd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin' into validate-user-info  
							
							
							
						 
						
							2018-11-30 17:34:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8f1fffebc6 
								
							 
						 
						
							
							
								
								Fix transmogrifier test.  
							
							
							
						 
						
							2018-11-30 17:31:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8c05d19c7f 
								
							 
						 
						
							
							
								
								MRF: add user allowlist module  
							
							
							
						 
						
							2018-11-26 23:51:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								675653ceb7 
								
							 
						 
						
							
							
								
								Merge branch 'feature/admin-api' into 'develop'  
							
							... 
							
							
							
							Add a admin API
See merge request pleroma/pleroma!366  
							
						 
						
							2018-11-22 00:28:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0896cf4c0f 
								
							 
						 
						
							
							
								
								Fix most mastodon api bugs.  
							
							
							
						 
						
							2018-11-20 20:12:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								40d9d2098c 
								
							 
						 
						
							
							
								
								Fix user updating from AP.  
							
							
							
						 
						
							2018-11-18 22:15:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4c918392c6 
								
							 
						 
						
							
							
								
								Fix most User tests.  
							
							
							
						 
						
							2018-11-18 21:40:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f6be980f4f 
								
							 
						 
						
							
							
								
								activitypub: object view: avoid leaking private details  
							
							
							
						 
						
							2018-11-17 22:30:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								dfcfb184b1 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: make deletes secure  
							
							
							
						 
						
							2018-11-17 21:22:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								12ccf0c4f8 
								
							 
						 
						
							
							
								
								Change Relay from status to {status, message}  
							
							
							
						 
						
							2018-11-17 22:12:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c88533209c 
								
							 
						 
						
							
							
								
								activitypub: user fetching: use fetch_and_contain_remote_object_from_id()  
							
							
							
						 
						
							2018-11-17 20:16:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								daa8ec3d62 
								
							 
						 
						
							
							
								
								activitypub: factor out AP object fetching to it's own function and add ID-based containment  
							
							
							
						 
						
							2018-11-17 20:15:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								265c8c5209 
								
							 
						 
						
							
							
								
								Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error if it didn’t  
							
							
							
						 
						
							2018-11-17 20:25:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								603fccf175 
								
							 
						 
						
							
							
								
								activitypub: fetch_object_from_id(): prefer actor over attributedTo to avoid spoofing  
							
							
							
						 
						
							2018-11-17 18:17:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								97e50f3191 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: sanitize internal representation details from outgoing objects  
							
							... 
							
							
							
							this causes JSON-LD parsers to get upset and has also lead to developer confusion from outside
projects which tried to parse our internal data.  accordingly, it seems better to just remove
it. 
							
						 
						
							2018-11-10 12:24:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f8310114a6 
								
							 
						 
						
							
							
								
								activitypub: object view: sanitize both the activity and the object when an activity is given for rendering  
							
							
							
						 
						
							2018-11-10 12:04:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								7daa102fa4 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/local-jsonld-context' into 'develop'  
							
							... 
							
							
							
							Host LitePub JSON-LD context locally
See merge request pleroma/pleroma!435  
							
						 
						
							2018-11-10 11:37:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e4971553c7 
								
							 
						 
						
							
							
								
								activitypub: utils: use same object type list for mention extraction as insertion  
							
							
							
						 
						
							2018-11-09 13:40:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b9871e7e5a 
								
							 
						 
						
							
							
								
								activitypub: utils: wrap Note objects in a Create when extracting mentions  
							
							
							
						 
						
							2018-11-09 09:01:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6cadfcb21e 
								
							 
						 
						
							
							
								
								activitypub: utils: switch to using new Notification.get_notified_from_activity().  
							
							
							
						 
						
							2018-11-09 09:01:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6b4064fa5d 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: unify mention extraction  
							
							
							
						 
						
							2018-11-08 19:41:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								934125695d 
								
							 
						 
						
							
							
								
								Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld  
							
							
							
						 
						
							2018-11-08 20:21:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3e33479c05 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: only consider to users as mention targets  
							
							
							
						 
						
							2018-11-08 18:58:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								abcacec97d 
								
							 
						 
						
							
							
								
								Pleroma.Web.ActivityPub.Utils: Use locally-served JSON-LD Litepub context instead of Github-hosted one  
							
							
							
						 
						
							2018-11-08 19:38:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								da16ada424 
								
							 
						 
						
							
							
								
								utils: use litepub @context instead of that huge mess  
							
							
							
						 
						
							2018-11-08 16:52:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f733470037 
								
							 
						 
						
							
							
								
								user view: unify a @context entry that was missed  
							
							
							
						 
						
							2018-11-08 16:51:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								59cf7cf235 
								
							 
						 
						
							
							
								
								Merge branch 'small-jsonld-refactor' into 'develop'  
							
							... 
							
							
							
							Small jsonld refactor
See merge request pleroma/pleroma!433  
							
						 
						
							2018-11-08 16:23:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								34bd411781 
								
							 
						 
						
							
							
								
								Unify json ld header handling.  
							
							
							
						 
						
							2018-11-08 16:39:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3b02fd9fb7 
								
							 
						 
						
							
							
								
								Small refactor.  
							
							
							
						 
						
							2018-11-08 16:05:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								b451a92d78 
								
							 
						 
						
							
							
								
								Merge branch 'runtime-config' into 'develop'  
							
							... 
							
							
							
							Runtime configuration
See merge request pleroma/pleroma!430  
							
						 
						
							2018-11-07 22:32:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9070588493 
								
							 
						 
						
							
							
								
								Runtime config: MRF changes  
							
							
							
						 
						
							2018-11-07 10:40:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5bb88fd174 
								
							 
						 
						
							
							
								
								Runtime configuration  
							
							... 
							
							
							
							Related to #85 
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro. 
							
						 
						
							2018-11-06 19:41:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0f3e78addb 
								
							 
						 
						
							
							
								
								Merge branch 'runtime-router' into 'develop'  
							
							... 
							
							
							
							Runtime configured router
See merge request pleroma/pleroma!426  
							
						 
						
							2018-11-06 15:35:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2bc924ba45 
								
							 
						 
						
							
							
								
								Get rid of Pleroma.Config in favor of Application  
							
							... 
							
							
							
							Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232  
							
						 
						
							2018-11-06 15:12:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6fe23c5458 
								
							 
						 
						
							
							
								
								Runtime configured router  
							
							
							
						 
						
							2018-11-05 15:19:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9f03b5c4f7 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: add support for Page objects  
							
							
							
						 
						
							2018-11-01 09:59:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								eba9a62024 
								
							 
						 
						
							
							
								
								Merge branch 'feature/relay-tests' into 'develop'  
							
							... 
							
							
							
							relay tests
See merge request pleroma/pleroma!411  
							
						 
						
							2018-11-01 09:10:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								40676d7683 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/prismo.news_article_url' into 'develop'  
							
							... 
							
							
							
							Bugfix/prismo.news article url
Closes  #352 
See merge request pleroma/pleroma!410  
							
						 
						
							2018-11-01 09:05:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1e9ced5af4 
								
							 
						 
						
							
							
								
								Test Relay, switch to runtime configuration.  
							
							
							
						 
						
							2018-11-01 09:01:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b2da5262ea 
								
							 
						 
						
							
							
								
								Pleroma.Web.ActivityPub.Transmogrifier: fix_url when not a string/empty  
							
							... 
							
							
							
							Thanks prismo.news, I hate it 
							
						 
						
							2018-11-01 09:56:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								10f3958468 
								
							 
						 
						
							
							
								
								object: return the deleted object as well  
							
							
							
						 
						
							2018-11-01 07:47:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2bf358d7b4 
								
							 
						 
						
							
							
								
								activitypub: use Object.delete() instead of mutating the database and cache directly  
							
							
							
						 
						
							2018-11-01 07:29:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								b92e38d2d4 
								
							 
						 
						
							
							
								
								Add user reactivation task.  
							
							
							
						 
						
							2018-10-29 23:13:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								167d3789a5 
								
							 
						 
						
							
							
								
								activitypub: upload: pass through an upload limit if one is provided  
							
							
							
						 
						
							2018-10-29 16:43:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								72ea54de6e 
								
							 
						 
						
							
							
								
								activitypub: fix possible false positives with broken thread filtering  
							
							
							
						 
						
							2018-10-28 05:45:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								26eb11c172 
								
							 
						 
						
							
							
								
								activitypub: add support for filtering broken threads out of timelines  
							
							
							
						 
						
							2018-10-26 06:16:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f6cb963df2 
								
							 
						 
						
							
							
								
								activitypub utils: fix recipient check when the message is unaddressed (mastodon)  
							
							
							
						 
						
							2018-10-26 01:24:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ce70eb8c00 
								
							 
						 
						
							
							
								
								activitypub utils: fix user splicing  
							
							
							
						 
						
							2018-10-25 05:24:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2f1f1a4f30 
								
							 
						 
						
							
							
								
								activitypub: splice users into recipient lists when they receive messages at their personal inbox  
							
							... 
							
							
							
							closes  #343  
						
							2018-10-25 05:02:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5383887bd4 
								
							 
						 
						
							
							
								
								transmogrifier: do not try to contain origin of something which doesn't have one  
							
							
							
						 
						
							2018-10-25 04:27:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a71b822013 
								
							 
						 
						
							
							
								
								activitypub: always track following state for async reasons  
							
							
							
						 
						
							2018-10-05 23:31:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8ce217776d 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: better manage follow state  
							
							
							
						 
						
							2018-10-05 23:30:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4db1bc2c0e 
								
							 
						 
						
							
							
								
								activitypub: fix error condition match  
							
							
							
						 
						
							2018-09-30 05:26:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								707077edde 
								
							 
						 
						
							
							
								
								activitypub: don't fall back to OStatus fetching when MRF rejects an object  
							
							
							
						 
						
							2018-09-28 00:45:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5c312ad677 
								
							 
						 
						
							
							
								
								activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else  
							
							... 
							
							
							
							although the previous handling assumed any unsigned/invalid signature message was a Create,
lets make it more explicit 
							
						 
						
							2018-09-28 00:03:59 +00:00