Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								8176ca9e40 
								
							 
						 
						
							
							
								
								static_fe: Sanitize HTML in users  
							
							
							
						 
						
							2020-03-15 20:44:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								05da5f5cca 
								
							 
						 
						
							
							
								
								Update Copyrights  
							
							
							
						 
						
							2020-03-03 16:44:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8f79f433bc 
								
							 
						 
						
							
							
								
								Hide follower counter when hiding is activated  
							
							
							
						 
						
							2019-12-17 13:34:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								701815e64c 
								
							 
						 
						
							
							
								
								[ActivityPub] Configurable ActivityPub actor type  
							
							
							
						 
						
							2019-12-10 13:19:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a11a7176d5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/activity_pub/transmogrifier.ex 
							
						 
						
							2019-10-21 11:05:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								c9280b9730 
								
							 
						 
						
							
							
								
								rework to use properties instead of compound typing, per SocialCG  
							
							
							
						 
						
							2019-10-19 23:21:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								10ff01acd9 
								
							 
						 
						
							
							
								
								[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.  
							
							
							
						 
						
							2019-10-16 21:59:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fefbd31c6e 
								
							 
						 
						
							
							
								
								Move local keys out of user.info  
							
							
							
						 
						
							2019-10-06 16:56:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								83631752af 
								
							 
						 
						
							
							
								
								removed legacy api: "/objects/:uuid/likes"  
							
							
							
						 
						
							2019-10-04 22:35:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2dad6dd020 
								
							 
						 
						
							
							
								
								Extract apps actions from MastodonAPIController to AppController  
							
							
							
						 
						
							2019-10-01 15:21:46 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								26f66fb70a 
								
							 
						 
						
							
							
								
								Merge branch 'features/apc2s-media-upload' into 'develop'  
							
							... 
							
							
							
							AP C2S mediaUpload
Closes  #1171 
See merge request pleroma/pleroma!1706  
							
						 
						
							2019-09-30 11:21:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								84712c35f9 
								
							 
						 
						
							
							
								
								activitypub: object view: include child object for Listen activities  
							
							
							
						 
						
							2019-09-30 10:39:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								5fb72170a7 
								
							 
						 
						
							
							
								
								Revert "add _discoverable_ keyword into ActivityPub @context"  
							
							... 
							
							
							
							This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5. 
							
						 
						
							2019-09-26 02:57:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f92d7d52c2 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex  
							
							
							
						 
						
							2019-09-25 13:38:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d87be2ec96 
								
							 
						 
						
							
							
								
								Don't embed the first page in inboxes/outboxes and refactor the views to  
							
							... 
							
							
							
							follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased. 
							
						 
						
							2019-09-25 15:59:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ad9595ca55 
								
							 
						 
						
							
							
								
								Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'  
							
							... 
							
							
							
							added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651  
							
						 
						
							2019-09-23 22:34:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								e1d2d69c87 
								
							 
						 
						
							
							
								
								Clean up views  
							
							
							
						 
						
							2019-09-23 22:33:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								38245f1336 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into test/activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2019-09-23 21:32:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								815b904508 
								
							 
						 
						
							
							
								
								Add support for AP C2S uploadMedia  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171  
							
						 
						
							2019-09-23 20:00:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									D Anzorge 
								
							 
						 
						
							
							
							
							
								
							
							
								0e6085da10 
								
							 
						 
						
							
							
								
								Fix pagination in AP outbox.json  
							
							
							
						 
						
							2019-09-19 16:09:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d4ed3a35b8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into test/activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2019-09-19 07:35:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								450bf7a63c 
								
							 
						 
						
							
							
								
								Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)  
							
							
							
						 
						
							2019-09-17 14:45:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								007e0c1ce1 
								
							 
						 
						
							
							
								
								added tests  
							
							
							
						 
						
							2019-09-11 23:19:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								f7bbf99caa 
								
							 
						 
						
							
							
								
								Use info.fields instead of source_data for remote users  
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								7d6f8a7fd7 
								
							 
						 
						
							
							
								
								Linkify custom fields values in ActivityPub.UserViewx  
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								88598c9baf 
								
							 
						 
						
							
							
								
								Add profile custom fields to ActivityPub.UserView  
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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