Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								beba7bbc85
								
							
						 | 
						
							
							
								
								removing synchronization worker
							
							
							
							
							
						 | 
						
							2019-07-10 17:42:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								2d2b50ccca
								
							
						 | 
						
							
							
								
								Send and handle "Delete" activity for deleted users
							
							
							
							
							
						 | 
						
							2019-07-10 05:16:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2b9d914089
								
							
						 | 
						
							
							
								
								[#161] Refactoring, documentation.
							
							
							
							
							
						 | 
						
							2019-06-30 15:58:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b7b1040b3
								
							
						 | 
						
							
							
								
								[#161] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
							
							
							
							
							
						 | 
						
							2019-06-29 20:04:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								d020f68e87
								
							
						 | 
						
							
							
								
								Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
							
							
							
							
							
						 | 
						
							2019-06-07 20:40:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e1370ba131
								
							
						 | 
						
							
							
								
								Utils: Use update_follow_state_for_all when appropriate.
							
							
							
							
							
						 | 
						
							2019-06-05 16:51:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								076c9ae40e
								
							
						 | 
						
							
							
								
								User: Remove superfluous maybe_follow.
							
							
							
							
							
						 | 
						
							2019-06-05 14:24:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3115b64cfe
								
							
						 | 
						
							
							
								
								Transmogrifier: Add tests for incoming follows to locked accounts.
							
							
							
							
							
						 | 
						
							2019-06-05 14:10:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								026b245dbc
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/polls-2-electric-boogalo
							
							
							
							
							
						 | 
						
							2019-06-03 11:14:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								65db5e9f52
								
							
						 | 
						
							
							
								
								Resolve merge conflicts
							
							
							
							
							
						 | 
						
							2019-06-01 16:29:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								2bbc2a801f
								
							
						 | 
						
							
							
								
								Remove all follower collections but actor's from "cc"
							
							
							
							
							
						 | 
						
							2019-06-01 03:26:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								a9eaa55885
								
							
						 | 
						
							
							
								
								Fix fix_explicit_addressing moving follower collection to cc and add tests for it
							
							
							
							
							
						 | 
						
							2019-05-31 14:17:05 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								19c90d47c4
								
							
						 | 
						
							
							
								
								Normalize poll votes to Answer objects
							
							
							
							
							
						 | 
						
							2019-05-22 21:17:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ece901af3
								
							
						 | 
						
							
							
								
								Resolve merge conflicts and remove IO.inspects
							
							
							
							
							
						 | 
						
							2019-05-18 13:37:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7ed682213f
								
							
						 | 
						
							
							
								
								Fix/902 random compile failing
							
							
							
							
							
						 | 
						
							2019-05-17 07:25:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								62e42b03ab
								
							
						 | 
						
							
							
								
								Handle incoming Question objects
							
							
							
							
							
						 | 
						
							2019-05-15 20:10:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2f76a40d02
								
							
						 | 
						
							
							
								
								formatter.ex: Add get_emoji_map/1
							
							
							
							
							
						 | 
						
							2019-05-03 16:27:50 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								f11e7037c2
								
							
						 | 
						
							
							
								
								test fixes
							
							
							
							
							
						 | 
						
							2019-05-01 16:09:53 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								bdfa3a6fa8
								
							
						 | 
						
							
							
								
								Merging with develop
							
							
							
							
							
							
							
							Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex 
							
						 | 
						
							2019-05-01 12:29:33 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								0fd0ffcd76
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: send reject follow if following does not succeed
							
							
							
							
							
						 | 
						
							2019-04-25 00:48:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor
								
							 
						 | 
						
							
							
							
							
								
							
							
								b9cdf6d3b9
								
							
						 | 
						
							
							
								
								Use User.get_cached* everywhere
							
							
							
							
							
						 | 
						
							2019-04-22 07:20:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad681877df
								
							
						 | 
						
							
							
								
								Make credo happy
							
							
							
							
							
						 | 
						
							2019-04-17 14:52:01 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								627e5a0a49
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/database-compaction
							
							
							
							
							
						 | 
						
							2019-04-17 12:22:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								5d73dca064
								
							
						 | 
						
							
							
								
								Remove inReplyToStatusId
							
							
							
							
							
						 | 
						
							2019-04-15 11:50:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								0ab563d334
								
							
						 | 
						
							
							
								
								Merge branch 'hotfix/fix_undefined_summary' into 'develop'
							
							
							
							
							
							
							
							transmogrifier.ex: Add fix_summary/1
See merge request pleroma/pleroma!1039 
							
						 | 
						
							2019-04-10 02:10:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cf9ba8fe1b
								
							
						 | 
						
							
							
								
								transmogrifier.ex: Add fix_summary/1
							
							
							
							
							
							
							
							MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway. 
							
						 | 
						
							2019-04-10 02:32:04 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								cfa6e7289f
								
							
						 | 
						
							
							
								
								Improve Transmogrifier.upgrade_user_from_ap_id/2
							
							
							
							
							
						 | 
						
							2019-04-04 16:10:43 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								1685e4258f
								
							
						 | 
						
							
							
								
								transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
							
							
							
							
							
						 | 
						
							2019-03-19 18:39:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd055983c3
								
							
						 | 
						
							
							
								
								transmogrifier: when determining followers collection URI, we may need to fetch the actor
							
							
							
							
							
						 | 
						
							2019-03-19 18:04:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								d487b753c3
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
							
							
							
							
							
						 | 
						
							2019-03-19 17:30:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								798da28812
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: ensure as:Public activities are delivered to followers
							
							
							
							
							
						 | 
						
							2019-03-19 17:27:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zachary Dunn
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ba14c664b
								
							
						 | 
						
							
							
								
								Fix missing end brace
							
							
							
							
							
						 | 
						
							2019-03-18 14:05:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zachary Dunn
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2e03d4f3c
								
							
						 | 
						
							
							
								
								Initial attempt at updating return type
							
							
							
							
							
						 | 
						
							2019-03-18 13:56:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f3ecb2bfb
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: accept remote Flag activities
							
							
							
							
							
						 | 
						
							2019-03-14 19:06:02 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c3d41b2b6e
								
							
						 | 
						
							
							
								
								[Credo] make all variables use snake_case
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483
								
							
						 | 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								6038c8a753
								
							
						 | 
						
							
							
								
								Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
							
							
							
							
							
						 | 
						
							2019-03-11 09:02:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e0686efa6
								
							
						 | 
						
							
							
								
								Move visibility into own module.
							
							
							
							
							
						 | 
						
							2019-02-22 13:29:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								ecdf0657ba
								
							
						 | 
						
							
							
								
								Add logic for keeping follow_request_count up-to-date on the follow,
							
							
							
							
							
							
							
							`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view. 
							
						 | 
						
							2019-02-15 12:20:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								e05bf2940f
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: correctly handle nil inReplyTo value
							
							
							
							
							
						 | 
						
							2019-02-14 00:35:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								94cbbb0e3a
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
							
							
							
							
							
						 | 
						
							2019-02-14 00:35:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251
								
							
						 | 
						
							
							
								
								de-group alias/es
							
							
							
							
							
						 | 
						
							2019-02-09 16:31:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								60ea29dfe6
								
							
						 | 
						
							
							
								
								Credo fixes: alias grouping/ordering
							
							
							
							
							
						 | 
						
							2019-02-09 14:59:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								e71ab5a10f
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: fix bare tags
							
							
							
							
							
						 | 
						
							2019-02-05 00:43:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								cbb2b709de
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: fix follow request rejections
							
							
							
							
							
						 | 
						
							2019-01-29 11:57:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								77f2137383
								
							
						 | 
						
							
							
								
								Transmogrifier: fix incoming objects with invalid likes
							
							
							
							
							
						 | 
						
							2019-01-27 19:33:21 +01: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								2de208817c
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into rename/pleroma_activity_consistency
							
							
							
							
							
						 | 
						
							2019-01-23 13:05:58 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								28d77e373c
								
							
						 | 
						
							
							
								
								Flake Ids for Users and Activities
							
							
							
							
							
						 | 
						
							2019-01-23 11:26:27 +01: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 | 
						
						
							
							
							
								
							
							
						 |