| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 refererheader. 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 |  | 
				
					
						| 
								
								
									 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. Instancerefactoring. | 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 infofrom being overwritten because of race conditionsand 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 directMessageset 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 |  |