Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								e8ad116c2a 
								
							 
						 
						
							
							
								
								Do not add the "next" key to likes.json if there is no more items  
							
							 
							
							
							
						 
						
							2019-08-04 17:13:06 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1fce56c7df 
								
							 
						 
						
							
							
								
								Refactor  
							
							 
							
							
							
						 
						
							2019-08-03 18:37:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								16cfb89240 
								
							 
						 
						
							
							
								
								Only add preferredUsername to service actor json when the underlying user actually has a username  
							
							 
							
							
							
						 
						
							2019-08-03 18:28:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a187dbb326 
								
							 
						 
						
							
							
								
								Add preferredUsername to service actors so Mastodon can resolve them  
							
							 
							
							
							
						 
						
							2019-08-03 17:24:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								cf9cb953d5 
								
							 
						 
						
							
							
								
								activitypub: represent internal fetch actor  
							
							 
							
							
							
						 
						
							2019-07-17 17:34:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1f6ac7680d 
								
							 
						 
						
							
							
								
								ActivityPub User view: Following/Followers refactoring  
							
							 
							
							... 
							
							
							
							- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it 
							
						 
						
							2019-07-12 19:41:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								045803346d 
								
							 
						 
						
							
							
								
								move key generation functions into Pleroma.Keys module  
							
							 
							
							
							
						 
						
							2019-05-22 03:58:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f76a40d02 
								
							 
						 
						
							
							
								
								formatter.ex: Add get_emoji_map/1  
							
							 
							
							
							
						 
						
							2019-05-03 16:27:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								10a7a4a868 
								
							 
						 
						
							
							
								
								AP UserView: Refactor banner / avatar display code, add test.  
							
							 
							
							
							
						 
						
							2019-03-26 16:59:28 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6f090f981b 
								
							 
						 
						
							
							
								
								Attempt to fix incorrect federation of default instance avatars  
							
							 
							
							
							
						 
						
							2019-03-25 18:47:04 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8c70156157 
								
							 
						 
						
							
							
								
								activitypub: object view: use preloaded object when possible  
							
							 
							
							
							
						 
						
							2019-03-23 03:05:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder  
							
							 
							
							
							
						 
						
							2019-03-13 04:26:54 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									KZ 
								
							 
						 
						
							
							
							
							
								
							
							
								7c722c08f5 
								
							 
						 
						
							
							
								
								Fix: Fixing an outbox related bug when local user activity is empty  
							
							 
							
							
							
						 
						
							2019-02-22 04:37:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								72ba5b4ab7 
								
							 
						 
						
							
							
								
								activitypub: user view: formatting  
							
							 
							
							
							
						 
						
							2019-02-14 03:13:07 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5307c211b8 
								
							 
						 
						
							
							
								
								activitypub: user view: report totalItems=0 for follows/followers when hidden  
							
							 
							
							
							
						 
						
							2019-02-14 03:10:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6542b86292 
								
							 
						 
						
							
							
								
								activitypub: user view: remove totalItems from user outbox  
							
							 
							
							... 
							
							
							
							(this is based on a counter in User.Info, but the counter is not reliable.) 
							
						 
						
							2019-02-14 03:02:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ee2fa1a314 
								
							 
						 
						
							
							
								
								activitypub: user view: remove totalInbox from user inbox view  
							
							 
							
							... 
							
							
							
							It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway. 
							
						 
						
							2019-02-14 03:01:39 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								64620d8980 
								
							 
						 
						
							
							
								
								activitypub: user view: do not expose oAuth endpoints for instance users  
							
							 
							
							
							
						 
						
							2019-02-14 02:41:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9bd6ed975e 
								
							 
						 
						
							
							
								
								activitypub: user view: use route helpers instead of hardcoded URIs  
							
							 
							
							
							
						 
						
							2019-02-13 19:34:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								29e946ace4 
								
							 
						 
						
							
							
								
								activitypub: user view: add oauthRegistrationEndpoint to user profiles  
							
							 
							
							
							
						 
						
							2019-02-13 19:34:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								db8abd958d 
								
							 
						 
						
							
							
								
								activitypub: user view: fix up endpoints rendering  
							
							 
							
							
							
						 
						
							2019-02-13 19:34:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								90facd3598 
								
							 
						 
						
							
							
								
								user view: add AP C2S oauth endpoints to local user profiles  
							
							 
							
							
							
						 
						
							2019-02-13 19:34:43 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								74518d0b60 
								
							 
						 
						
							
							
								
								hide_followings was renamed to hide_followers in the FE, but never synced up in the BE  
							
							 
							
							... 
							
							
							
							This was a dirty regex replace which worked on my server 
							
						 
						
							2019-02-06 22:34:44 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f753043ce0 
								
							 
						 
						
							
							
								
								Fix if clause in activity_pub user_view  
							
							 
							
							
							
						 
						
							2019-02-06 18:42:19 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								50d6183893 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings  
							
							 
							
							
							
						 
						
							2019-01-28 21:40:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								28d77e373c 
								
							 
						 
						
							
							
								
								Flake Ids for Users and Activities  
							
							 
							
							
							
						 
						
							2019-01-23 11:26:27 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								948fba6f76 
								
							 
						 
						
							
							
								
								Fix bad link in likes collection  
							
							 
							
							... 
							
							
							
							Don't copy and paste, mkay 
							
						 
						
							2019-01-17 18:21:43 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								581edd5a91 
								
							 
						 
						
							
							
								
								Add route to get object like activities  
							
							 
							
							
							
						 
						
							2019-01-12 20:24:38 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								980b5288ed 
								
							 
						 
						
							
							
								
								update copyright years to 2019  
							
							 
							
							
							
						 
						
							2018-12-31 15:41:47 +00: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							 
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6be0ab1e55 
								
							 
						 
						
							
							
								
								Hide network in ap.  
							
							 
							
							
							
						 
						
							2018-12-02 17:35:32 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0896cf4c0f 
								
							 
						 
						
							
							
								
								Fix most mastodon api bugs.  
							
							 
							
							
							
						 
						
							2018-11-20 20:12:39 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f6be980f4f 
								
							 
						 
						
							
							
								
								activitypub: object view: avoid leaking private details  
							
							 
							
							
							
						 
						
							2018-11-17 22:30:53 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f733470037 
								
							 
						 
						
							
							
								
								user view: unify a @context entry that was missed  
							
							 
							
							
							
						 
						
							2018-11-08 16:51:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3b02fd9fb7 
								
							 
						 
						
							
							
								
								Small refactor.  
							
							 
							
							
							
						 
						
							2018-11-08 16:05:28 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								46c7c2380c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/relay' into 'develop'  
							
							 
							
							... 
							
							
							
							message relay
Closes  #144 
See merge request pleroma/pleroma!264  
							
						 
						
							2018-08-27 08:29:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								63094cfd3e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/emoji-in-local-users' into 'develop'  
							
							 
							
							... 
							
							
							
							Add emoji to local user profiles.
Closes  #202 
See merge request pleroma/pleroma!271  
							
						 
						
							2018-08-26 23:24:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0f5bff8c66 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/relay'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex 
							
						 
						
							2018-08-26 21:06:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								38361e7b5e 
								
							 
						 
						
							
							
								
								Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix: Output repeats at ActivityPub outbox
Closes  #191 
See merge request pleroma/pleroma!175  
							
						 
						
							2018-08-16 15:19:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								1ed1ff17a4 
								
							 
						 
						
							
							
								
								ActivityPub user view: include tag if present.  
							
							 
							
							
							
						 
						
							2018-08-13 16:11:48 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1e1a29f084 
								
							 
						 
						
							
							
								
								activitypub: relay: fix up AS2 actor object  
							
							 
							
							
							
						 
						
							2018-08-06 08:22:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								56dc8db582 
								
							 
						 
						
							
							
								
								activitypub: relay: add relay following/followers collection URLs  
							
							 
							
							
							
						 
						
							2018-08-06 08:22:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								00e890264c 
								
							 
						 
						
							
							
								
								activitypub: represent relay actor at instance root  
							
							 
							
							
							
						 
						
							2018-08-06 08:22:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8546551257 
								
							 
						 
						
							
							
								
								activitypub: switch to using x509 representation for public keys instead of pkcs#1  
							
							 
							
							
							
						 
						
							2018-07-12 03:30:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								e90b734f1c 
								
							 
						 
						
							
							
								
								debug  
							
							 
							
							
							
						 
						
							2018-05-26 14:10:12 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								9c7da2ef48 
								
							 
						 
						
							
							
								
								output repeats at ActivityPub outbox  
							
							 
							
							
							
						 
						
							2018-05-26 14:02:57 +09:00